Message ID | 20230602210440.8411-3-quic_jhugo@quicinc.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1309048vqr; Fri, 2 Jun 2023 14:24:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6QoRLNLaoLsalGOIaiC3EC/qRM5m4a1vFrKIjHJejcRLCdq93uvAtuLfzgxKufjLcmzVHR X-Received: by 2002:a17:902:8207:b0:1a6:ff51:270 with SMTP id x7-20020a170902820700b001a6ff510270mr942864pln.29.1685741055079; Fri, 02 Jun 2023 14:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685741055; cv=none; d=google.com; s=arc-20160816; b=uvcMK5fE4hiIWbMIQQRXx43HV6qaknIiWnHEZx1OmyfSNnRiPAi4Vy6OyuMBhMrkvL wQwvYpvggIYWbX3aSa+JYq8Ot4v+c9Rk0jv4ivCZ5RSkXl8sMSCtbO5Pxz5AwnjJQrAL y7bvXaH1OAU/FLjhPTBx4LWbhcP8MjpMW485gfb8xzV1+RADV2opoMUO/Rpp/JaRfEHn cO/vjypfQIrQTRMEpodOLglIa6h/limmPAo71YzlJxRPqTKaivujgeSOfb7vsYE/a2wR +nDJaJmSn157I+wleqAANYX2qT7ipbxRst938+aLvCAv2DNIVWiwhbCAJh52nCW8osGD gkUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rudHhuOEFo80iwVEJ5/Pzd3vaSKEsnfQGFbEXor5irM=; b=Uq9fr4LKW1GsWjjMmk++u9VBDoqGgoKeQwL/5SwNBThOqZDW9F6f6zXIO5isvh3K5D kI1qMobzEUiVOFzoO3TLMyJveU2gEkF9Sn425wcsjuGHbycE2kD6y8EsaS4vausfT81M mdFgrCsZAY+6KvmJRUyseR+FQnWr7CDI2iiK4wg9BHGWuosX6poERBOUOTrDFnUsZvVB L++L/TVzF+KRMD0YUMNrDzcSr3T9uDQExybQGrjqewsFOGESzo8Xd+PFyIKQk9DR+CwG M4Qy8f7kSskjyjXFGE38J5xOI3dd6WiGQNW6XuUxZDZdxN3ZNXfmRZlCmAKjQ2j2sc4F K5dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=lT5Jvb1d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a170902a60e00b001b04a6330a1si1457875plq.170.2023.06.02.14.23.59; Fri, 02 Jun 2023 14:24:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=lT5Jvb1d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236458AbjFBVFK (ORCPT <rfc822;limurcpp@gmail.com> + 99 others); Fri, 2 Jun 2023 17:05:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236423AbjFBVFE (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 2 Jun 2023 17:05:04 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B764B197; Fri, 2 Jun 2023 14:05:03 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 352KXb37024509; Fri, 2 Jun 2023 21:05:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=rudHhuOEFo80iwVEJ5/Pzd3vaSKEsnfQGFbEXor5irM=; b=lT5Jvb1dPzua3uCa/gwU8QVQGzXidJ8KmYCMnMuuyeyViz+f+ZoFLTsy9Ett87R9OGsA /BesMPhfKv0+iqmiipcN313Uyc9oYU+3xQ030+UCRwvQqp53yB/d7k4OKZ823R/uB/pj Zy5x+68GO6gGHjjdye1L+4kTeb8GjVCFmCiODjM9rU8qrxsCD3EexhTXYuEqAhdtzMEM rFh7VJb/8dm+Hj/490zwLGOW+sb+XICGsU9gDRvz/QY5B8U0CfNzppGtC5DtEVpfbt99 XOyxxYAe6a1iPFQnmrBpnLiTnmO5YWhyskoCTMSk3NIsN1IayvP4rfk+7RFgIO2N9iCV Sw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qy1bcjsn8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Jun 2023 21:05:01 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 352L50he005299 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Jun 2023 21:05:00 GMT Received: from jhugo-lnx.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Fri, 2 Jun 2023 14:04:59 -0700 From: Jeffrey Hugo <quic_jhugo@quicinc.com> To: <dri-devel@lists.freedesktop.org> CC: <ogabbay@kernel.org>, <jacek.lawrynowicz@linux.intel.com>, <stanislaw.gruszka@linux.intel.com>, <quic_carlv@quicinc.com>, <quic_ajitpals@quicinc.com>, <linux-arm-msm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Jeffrey Hugo <quic_jhugo@quicinc.com>, Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com> Subject: [PATCH 2/2] accel/qaic: Fix NULL pointer deref in qaic_destroy_drm_device() Date: Fri, 2 Jun 2023 15:04:40 -0600 Message-ID: <20230602210440.8411-3-quic_jhugo@quicinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230602210440.8411-1-quic_jhugo@quicinc.com> References: <20230602210440.8411-1-quic_jhugo@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: jO6v4cEQTPOyKJf9k_z6fjSnn-4RCVxz X-Proofpoint-GUID: jO6v4cEQTPOyKJf9k_z6fjSnn-4RCVxz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-02_16,2023-06-02_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 malwarescore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306020163 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767627612907323366?= X-GMAIL-MSGID: =?utf-8?q?1767627612907323366?= |
Series |
accel/qaic fixes for 6.4 part 2
|
|
Commit Message
Jeffrey Hugo
June 2, 2023, 9:04 p.m. UTC
If qaic_destroy_drm_device() is called before the device has fully initialized it will cause a NULL pointer dereference as the drm device has not yet been created. Fix this with a NULL check. Fixes: c501ca23a6a3 ("accel/qaic: Add uapi and core driver file") Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Reviewed-by: Carl Vanderlip <quic_carlv@quicinc.com> Reviewed-by: Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com> --- drivers/accel/qaic/qaic_drv.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/accel/qaic/qaic_drv.c b/drivers/accel/qaic/qaic_drv.c index 961cd341b414..b5ba550a0c04 100644 --- a/drivers/accel/qaic/qaic_drv.c +++ b/drivers/accel/qaic/qaic_drv.c @@ -225,6 +225,9 @@ static void qaic_destroy_drm_device(struct qaic_device *qdev, s32 partition_id) struct qaic_user *usr; qddev = qdev->qddev; + qdev->qddev = NULL; + if (!qddev) + return; /* * Existing users get unresolvable errors till they close FDs.