From patchwork Sat Apr 8 06:56:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 81116 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp729728vqo; Sat, 8 Apr 2023 00:34:46 -0700 (PDT) X-Google-Smtp-Source: AKy350ZyUVpAkzGqwEXsmg+r68voB+7j5/5Tu/FftKQaxinxZtTJD/eqJeACu0MS1PG+z2bSyAyl X-Received: by 2002:a17:903:234f:b0:19d:f7e:9864 with SMTP id c15-20020a170903234f00b0019d0f7e9864mr6377968plh.57.1680939286099; Sat, 08 Apr 2023 00:34:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680939286; cv=none; d=google.com; s=arc-20160816; b=B0kc4+2cJXaxM+fbWhTCjV/bMymaugvHBw9Zs1OlWc9ADvKjpP0n2pCI1yj9RxpcwP 4+6exEjcjb+g/GLKJoOkb5zbFot2TltZbjgOzVJcBJfzMhtvSgQqvbLMrWkyzXkdzDo5 qAfj2YUrVVIhNyf0W9ek18Y9FwAaVLD34v4pKTXh2F9QOiaPQgHBZzhscLGjPBrMiwCr jI6BBcTG3xW1L7J0FJ3H6hbFLkYl2yL2tJQIx5fqGpz7ieL61n/XBbDcKFXRIdf8L3Hb FBVrK88ckSg/VWrOng668pWNcoiIWAcFBG53u2vxcabgIsTM6eZY0WT6SVLn1h/GhN6O pwBw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=gBdQ9z3RMrgblYJEU2yJN27X4Pd/JfytWfb4t7Ya1bI=; b=NdC36GStvTdKQD93EO6nW6rm5xSm3o2+KUJzRL0haRLmtX49EUC2YYEoL8uXXPUI8O TozmAUCxj+PNIhpURJtF/mlSslst8bo7iGN2XDzfVulQ00HFdfM/kfW/SkQH8sFjeDsi ZANbj3XOJdK+P9iXiw+k2Fw2q9qDqrhQMKZTUmZG62+LNb6vUFrnXpOMg20ZrdhwfHKl bOBqyc9cJ6sxY91u6+ZXyREzGQKdz8QlBDfIe9nIQonbI+PtP/Kd8O0rJf4TPb7XpcNs 2+OiI139gNctEQ3FI5eqko4HCqwCLCz4V8oDz1klZgQnv7CfIq3SN5vyuIZj/i3g6pTh 72Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b="0RnLr7l/"; 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=oracle.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kp14-20020a170903280e00b001a05e6bd125si5519892plb.25.2023.04.08.00.34.10; Sat, 08 Apr 2023 00:34:46 -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=@oracle.com header.s=corp-2022-7-12 header.b="0RnLr7l/"; 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=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230115AbjDHG4q (ORCPT + 99 others); Sat, 8 Apr 2023 02:56:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjDHG4o (ORCPT ); Sat, 8 Apr 2023 02:56:44 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23E64D501; Fri, 7 Apr 2023 23:56:42 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3383Waqj004888; Sat, 8 Apr 2023 06:56:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2022-7-12; bh=gBdQ9z3RMrgblYJEU2yJN27X4Pd/JfytWfb4t7Ya1bI=; b=0RnLr7l/yqpn5vpncGx9jls5z6Y9P+mjK5NJC7RYfUS++uuGKpHyf5yjWRqOeTDCABfT C09+TwoTg+HsHJyWEFyuu+abGeIZJbwUU4MS8Erjmqp/wORWoKAjIMyPHY4FkOWMqiRs yhnZlZhfsFMgqrtHgQrw6oeumZ/ImbX5bkUQeTa6zzqA32pV5YJBYmnJu7UcrSBknjjM w+5n4gCXfDqUrsNSJ5o/JJyaxdyrSaNqxdlAVnhqxnAHYp4yRPSeUzdH9+BCxIW90/ka 8wTC18c0J/eiyO0goRvHXv9SUG1FdsCYJ4vn6IeSddv8w1VOti3p414/7dUVqEebJCpa Og== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3pu0eq04b0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Apr 2023 06:56:27 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3383IZDH038795; Sat, 8 Apr 2023 06:56:26 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ptxq29n58-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 08 Apr 2023 06:56:26 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3386uP4w039417; Sat, 8 Apr 2023 06:56:25 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3ptxq29n39-1; Sat, 08 Apr 2023 06:56:25 +0000 From: Harshit Mogalapalli To: m.chetan.kumar@intel.com, linuxwwan@intel.com, loic.poulain@linaro.org, ryazanov.s.a@gmail.com, johannes@sipsolutions.net Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, error27@gmail.com, simon.horman@corigine.com, kernel-janitors@vger.kernel.org, vegard.nossum@oracle.com, Harshit Mogalapalli Subject: [PATCH net] net: wwan: iosm: Fix error handling path in ipc_pcie_probe() Date: Fri, 7 Apr 2023 23:56:07 -0700 Message-Id: <20230408065607.1633970-1-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-08_01,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304080061 X-Proofpoint-GUID: OXpYRl3brXA8dabr4OUKqJvg65clH_IS X-Proofpoint-ORIG-GUID: OXpYRl3brXA8dabr4OUKqJvg65clH_IS X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762592593183529853?= X-GMAIL-MSGID: =?utf-8?q?1762592593183529853?= Smatch reports: drivers/net/wwan/iosm/iosm_ipc_pcie.c:298 ipc_pcie_probe() warn: missing unwind goto? When dma_set_mask fails it directly returns without disabling pci device and freeing ipc_pcie. Fix this my calling a correct goto label As dma_set_mask returns either 0 or -EIO, we can use a goto label, as it finally returns -EIO. Renamed the goto label as name of the label before this patch is not relevant after this patch. Fixes: 035e3befc191 ("net: wwan: iosm: fix driver not working with INTEL_IOMMU disabled") Signed-off-by: Harshit Mogalapalli Reviewed-by: Simon Horman --- This is based on static analysis, only compile tested. --- drivers/net/wwan/iosm/iosm_ipc_pcie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wwan/iosm/iosm_ipc_pcie.c b/drivers/net/wwan/iosm/iosm_ipc_pcie.c index 5bf5a93937c9..a6a6a0df1f7d 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_pcie.c +++ b/drivers/net/wwan/iosm/iosm_ipc_pcie.c @@ -295,7 +295,7 @@ static int ipc_pcie_probe(struct pci_dev *pci, ret = dma_set_mask(ipc_pcie->dev, DMA_BIT_MASK(64)); if (ret) { dev_err(ipc_pcie->dev, "Could not set PCI DMA mask: %d", ret); - return ret; + goto err_disable_pci; } ipc_pcie_config_aspm(ipc_pcie); @@ -308,7 +308,7 @@ static int ipc_pcie_probe(struct pci_dev *pci, ipc_pcie->suspend = 0; if (ipc_pcie_resources_request(ipc_pcie)) - goto resources_req_fail; + goto err_disable_pci; /* Establish the link to the imem layer. */ ipc_pcie->imem = ipc_imem_init(ipc_pcie, pci->device, @@ -322,7 +322,7 @@ static int ipc_pcie_probe(struct pci_dev *pci, imem_init_fail: ipc_pcie_resources_release(ipc_pcie); -resources_req_fail: +err_disable_pci: pci_disable_device(pci); pci_enable_fail: kfree(ipc_pcie);