From patchwork Fri Dec 16 16:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 34004 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1062100wrn; Fri, 16 Dec 2022 08:23:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5diBGBCHC5MhLEN2uWgpZohjDR3Hl7co9XsdXbQ7OhuFqyAq07vNJ71S5bWP5zO/xBmyL/ X-Received: by 2002:a17:906:eb5b:b0:7c1:bb3:45e4 with SMTP id mc27-20020a170906eb5b00b007c10bb345e4mr28727027ejb.21.1671207785056; Fri, 16 Dec 2022 08:23:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671207785; cv=none; d=google.com; s=arc-20160816; b=zSy191Wm+xKSuOqlV0UZSGYQV1oizE13azi2mxJsLiY8td63PmOJehfcT4ssb3P899 5/IAQlXcj1RDeFtghrE2A/kUeai8mkVCvq2pYUe6Kji1vp+kM+f4Kl6p8jCbhwecaKPP yxcfIL3x9/CgqwEZaccyf+EMmH+GwSG8OP5FLnBE/o9Y8OWrYs3PPIdM03igI0N4QTzN JvgHH97TxQ7jxrTPZ7/UxkpqbHzR+0qQaj8790clmGRvbuhFaf8pzluDIcpPJju990so gZ040cZm0m1zlZ+Ay/7dk8K7e4ENiyT1lpJqUSgYvztRRMtph5bGUCK8wzp6ttD8w18p eFhg== 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=3EPggp5DfpTVo+3t1sm+GEre13nB1Zgkn7l9hWWjtHI=; b=fzxsTGa7eubLJWPbx/KGcHb/wUe4/+3wkAmHrwnE+d6ClXJIPlo+rppy0M0mMkP+z/ E3lo/TEl8qKX0LJCVkpmyDauZHEQ++R/5bJSAA0tsOFoUYdV7Xje0VHSkkfp1bzDFEIp LQONMQFCdHFxt3JYDEdWHM5FM8skjs8Mq/DvWoLRKYfGauULjljxdjiK/pH0IILhU1LS soAZeYFSztclHYA8CV6fEzCJxqry89vYssnv9FutGvO7f7v77LjY7Q4wVslGc6UgSow5 LvI883Xj9oD9G2RXbCtZxPm151E442TzPw6cikixI/NCsyxYk5LUetCDyAQrzJktt7mr SB+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KNP6sHNu; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id vg9-20020a170907d30900b007c16fdc93c4si2955226ejc.676.2022.12.16.08.22.41; Fri, 16 Dec 2022 08:23:05 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=KNP6sHNu; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231756AbiLPQWR (ORCPT + 99 others); Fri, 16 Dec 2022 11:22:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231759AbiLPQVi (ORCPT ); Fri, 16 Dec 2022 11:21:38 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BBF03F070; Fri, 16 Dec 2022 08:21:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 9A1FACE1D96; Fri, 16 Dec 2022 16:21:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABB46C433D2; Fri, 16 Dec 2022 16:21:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671207693; bh=PzuPc7E2HGZcpKuiGsxipxlDPcMLq+hLcAA6BrGvXh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KNP6sHNuqvsfLwddUOtgW00IFIbDXFC5VOfkOxvaXCmrT34Ud8SdZORryruHKnqa/ CVZouFi3Go0zZIVhkTLo0kO8nUSEvD4ESUY5aSa8RNyOi08jsL1fnpbn51E7DKE7qs ioi5DNMNI6eTJ/RJW2QaY3LjEU5CbouE1UHVXoo3jg3/c5TBTP1/CyoilB4IxNfPYS BOpzE7lJKfrJCqgDd5LkZqBmZvjY7cy3rMCiogfntS1F8b+MdyQrTM6Md3qEq0Rm8I 6Oc7H2eLXxHHxeBaDk/7PLV41rMUjGhCgHJDfhvdCaO0zHKgh2z+v/rCgEPhH3pi9C Dl/4Tc4CiXB7A== From: Bjorn Helgaas To: Kurt Schwemmer , Logan Gunthorpe Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2 1/2] PCI: switchtec: Simplify switchtec_dma_mrpc_isr() Date: Fri, 16 Dec 2022 10:21:25 -0600 Message-Id: <20221216162126.207863-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216162126.207863-1-helgaas@kernel.org> References: <20221216162126.207863-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752388374459954390?= X-GMAIL-MSGID: =?utf-8?q?1752388374459954390?= From: Bjorn Helgaas The "ret" variable in switchtec_dma_mrpc_isr() is superfluous. Remove it and just return the value. No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Logan Gunthorpe --- drivers/pci/switch/switchtec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 75be4fe22509..d7ae84070e29 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1480,15 +1480,13 @@ static irqreturn_t switchtec_event_isr(int irq, void *dev) static irqreturn_t switchtec_dma_mrpc_isr(int irq, void *dev) { struct switchtec_dev *stdev = dev; - irqreturn_t ret = IRQ_NONE; iowrite32(SWITCHTEC_EVENT_CLEAR | SWITCHTEC_EVENT_EN_IRQ, &stdev->mmio_part_cfg->mrpc_comp_hdr); schedule_work(&stdev->mrpc_work); - ret = IRQ_HANDLED; - return ret; + return IRQ_HANDLED; } static int switchtec_init_isr(struct switchtec_dev *stdev) From patchwork Fri Dec 16 16:21:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 34003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1061981wrn; Fri, 16 Dec 2022 08:22:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf7cuJoWnWqFSlER+6CVLYsy9ykR7sjlAV91iRjykchB05P6GnsVqPdLxg3yMsVZFA2sGVlh X-Received: by 2002:a17:906:4c4b:b0:7c1:1ada:5e1e with SMTP id d11-20020a1709064c4b00b007c11ada5e1emr27376565ejw.26.1671207770498; Fri, 16 Dec 2022 08:22:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671207770; cv=none; d=google.com; s=arc-20160816; b=f8QEyOOKIndtSLz9jFLJFwCDpmGi5Rbij3VYhyr0SpR7RDHFjj6feDQ9EHg8Y+p5tA UELHA+G96cHwKsbEEPT+JDiCzc9wGOryO+gtk22GhK9DP15l+q3dQtl9+lY3G2ujjTzA Iq7uOkGhNrcYk8w/iM98tHxrB+t16A8nM3vPw41ShUulr4d97LTd7AlynvO57sgHtaY5 st5WPCHr6NDcMTeMOJJVOWRKcyv+l1p2wIEKYqozs1GGyWANVw7ZdeKlXRlwR5WTAZzr SjusDJhplHaGp4VPNq2hP+EKVeKZTw8vemTPv7IwkeCNbHG7+76F4KHK5HPOeW0aYS1f WjiA== 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=4osyqz6wQplMW//vqUobJtB+lB8hcu5CaPkMps5JI1E=; b=zakhYRNlcw4M1CpUngUyyuIUFz+NNu2r7ojNueHoAFp5qAyIDN9RYhKKiv2DXgpKqR Eikj0VZbC+i4A3UB3/enDLru/HuJYkXvCWWtbVr5EZqcSu0vfFKbk7fOysUSO4s26aWv u/pKCLHyX14r3fZ9GXlk5FGsl4SMtbfn1QGdRPEhxJGu0GseGo665vl79a0XOP+sJXeF 9W4WgyFKf8NlrAEpIXf6RLamDFVFaYLQzDiy8uXvwUpBsaXAr0I/VRlPZMnDAahiD2qO 7+dmH05Mxq9puDONLzikKBrFQW7VHLo2o2J9cbxsS3kmsK0cGfrqBUQcpueZvZ12T6gX 91Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oi2Et4Gf; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lv26-20020a170906bc9a00b007d6648874adsi2204450ejb.751.2022.12.16.08.22.26; Fri, 16 Dec 2022 08:22:50 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=oi2Et4Gf; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231702AbiLPQWM (ORCPT + 99 others); Fri, 16 Dec 2022 11:22:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbiLPQVh (ORCPT ); Fri, 16 Dec 2022 11:21:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B95752A271; Fri, 16 Dec 2022 08:21:36 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 53E1C61FDD; Fri, 16 Dec 2022 16:21:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 849D6C433EF; Fri, 16 Dec 2022 16:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671207695; bh=rf/kiQvV904IrlTYmlNmOzv2wh9Ar7q41y6LIAE+Or8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oi2Et4GfdoQdyzLPIZ1SbYq8/8VIHiwgSJ8mxaRLr6tXw93y0Orz1U8kNwvkiyzax jOAwBgAmT3ETkYxFYShh4bNuy1iTF2w4DVjtgOApePWMIPNtXM9RKIJ3VkufRsQDbu QjtjhaheDWP8YcIQsOriWOXmytdi5oXNWuV+cHv3aMGGx6YC2yNE1qcjixaTYc5DEI ih/tZ0yRxyNr7RfPiO7+kT0vnOgb/UQw0VzCC+RVB4q6P2V+M6ROgnLqwfqaMIAaNY zMFEBXK8UOKZZGsmOHfZRASO4yNwtWFJzoRN2Bxh0Jo7k0POhT6WtiPYFMZWCYXVhm ah3wEyI9OZmYQ== From: Bjorn Helgaas To: Kurt Schwemmer , Logan Gunthorpe Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2 2/2] PCI: switchtec: Return -EFAULT for copy_to_user() errors Date: Fri, 16 Dec 2022 10:21:26 -0600 Message-Id: <20221216162126.207863-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216162126.207863-1-helgaas@kernel.org> References: <20221216162126.207863-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752388359162082140?= X-GMAIL-MSGID: =?utf-8?q?1752388359162082140?= From: Bjorn Helgaas switchtec_dev_read() didn't handle copy_to_user() errors correctly: it assigned "rc = -EFAULT", but actually returned either "size", -ENXIO, or -EBADMSG instead. Update the failure cases to unlock mrpc_mutex and return -EFAULT directly. Fixes: 080b47def5e5 ("MicroSemi Switchtec management interface driver") Signed-off-by: Bjorn Helgaas Reviewed-by: Logan Gunthorpe --- drivers/pci/switch/switchtec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index d7ae84070e29..0ac9d4488210 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -606,16 +606,16 @@ static ssize_t switchtec_dev_read(struct file *filp, char __user *data, rc = copy_to_user(data, &stuser->return_code, sizeof(stuser->return_code)); if (rc) { - rc = -EFAULT; - goto out; + mutex_unlock(&stdev->mrpc_mutex); + return -EFAULT; } data += sizeof(stuser->return_code); rc = copy_to_user(data, &stuser->data, size - sizeof(stuser->return_code)); if (rc) { - rc = -EFAULT; - goto out; + mutex_unlock(&stdev->mrpc_mutex); + return -EFAULT; } stuser_set_state(stuser, MRPC_IDLE);