From patchwork Wed Jan 4 20:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1721490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=fFSKXJ9k; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4NnLd43PdHz23fC for ; Thu, 5 Jan 2023 07:22:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240180AbjADUWo (ORCPT ); Wed, 4 Jan 2023 15:22:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240276AbjADUWc (ORCPT ); Wed, 4 Jan 2023 15:22:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 630691EAD6; Wed, 4 Jan 2023 12:22:31 -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 ams.source.kernel.org (Postfix) with ESMTPS id 11768B818D8; Wed, 4 Jan 2023 20:22:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6AACC433EF; Wed, 4 Jan 2023 20:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672863748; bh=PzuPc7E2HGZcpKuiGsxipxlDPcMLq+hLcAA6BrGvXh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fFSKXJ9kDEyc3NqbOseIaHVtsNoFMHxT57nbFueGmgzpIHtc5zdhLkZkGULEJLdpl ck0NyG98eE0zIzMrqB6R1UV2V2hd1E7CRKVSY1rYpgw8gCsVH2yI8NaSo4cK7xDqLx Xhfs4jVbRWEW8fDR5IKGddIGy2ym62XLD1PFzfhUuRit4uQ4KSqUNMu0jVedEBin4/ t5X1n6IwMJoETTR0cKEwVYNvAtIlKtNE+fdnruBLkSgPveACVfo6AA/1fwOAuITjsn uNvoqNCbPS8n0f4BMqcI1VwkIf9lmC7rLUIao3nLEK+VtnBvDxon7w/7ncCpl871Ug 7moJma+9wRMNQ== From: Bjorn Helgaas To: Lorenzo Pieralisi , Kurt Schwemmer , Logan Gunthorpe Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v3 1/2] PCI: switchtec: Simplify switchtec_dma_mrpc_isr() Date: Wed, 4 Jan 2023 14:22:22 -0600 Message-Id: <20230104202223.1091085-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230104202223.1091085-1-helgaas@kernel.org> References: <20230104202223.1091085-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-pci@vger.kernel.org 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 Wed Jan 4 20:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 1721491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=k11Z5mb6; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4NnLd61Zq5z23fC for ; Thu, 5 Jan 2023 07:22:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240202AbjADUWp (ORCPT ); Wed, 4 Jan 2023 15:22:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240278AbjADUWc (ORCPT ); Wed, 4 Jan 2023 15:22:32 -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 8713033D43; Wed, 4 Jan 2023 12:22:31 -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 2630161820; Wed, 4 Jan 2023 20:22:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62837C433D2; Wed, 4 Jan 2023 20:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672863750; bh=YwYZS1JBu2OO/OiLJWxi02BQaXs0otqCdVOkHYwmz4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k11Z5mb6auR2CbTEjGjeiQL6dYHiPZkomIt4y0tI3WLZys2HxCHeRanLW7WSQtwKn mxekBTdZ95mpxD6o4TgGoH2crtBSdCw6PsY28+W0qF5YlRWUx8Q+uJw2QLuQ653eZ2 fACLAbO+sVQNCSTafyFZBc1MaIEHg0W/FrXIgSfZ6aIKc3wckVg4NvWCp7/BzTe6Y1 oyMke2MGMuMcHmqylFrXMO+XA4p6wHncjl6flrLPMNZhIjxRQzIaMZDPQ0jB7XXho4 nF2BzF4H/g0u+EXwLYIAyl7NQAOqc+6g+YonaZPPG6gesHX02dWxHQqxZZeDaVlmp6 Tb9aZ+dqwfAVA== From: Bjorn Helgaas To: Lorenzo Pieralisi , Kurt Schwemmer , Logan Gunthorpe Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v3 2/2] PCI: switchtec: Return -EFAULT for copy_to_user() errors Date: Wed, 4 Jan 2023 14:22:23 -0600 Message-Id: <20230104202223.1091085-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230104202223.1091085-1-helgaas@kernel.org> References: <20230104202223.1091085-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-pci@vger.kernel.org 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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index d7ae84070e29..3d6f17ff2429 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -606,21 +606,20 @@ 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); -out: mutex_unlock(&stdev->mrpc_mutex); if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||