From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58F3EC25B0E for ; Fri, 19 Aug 2022 06:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345819AbiHSGIX (ORCPT ); Fri, 19 Aug 2022 02:08:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344671AbiHSGIG (ORCPT ); Fri, 19 Aug 2022 02:08:06 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7BE4C6CC4 for ; Thu, 18 Aug 2022 23:08:05 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id r4so4435673edi.8 for ; Thu, 18 Aug 2022 23:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=d7GvD5Hf8tzx2V16UHtbEc4zSmsYhgs5namwMdUKQPg=; b=MhZXIA8I23JAIDOSl3TCJR3q/kt7QCewH4booO6zJhMTlRoCIj2YrHJWmRntoYmFZ4 cCICmyZD35lqNDMMhceY0JFfaabpWnJJf2qmkH/FO63KEApecHeOjFH+Yqbl7Q/bQxkf uLH/JfGQIXPyqlBKdA8KLnyZdTuzSGv9208i2ifxxEKU8FuiK4B9KqzLAz2tAXqGA5M7 sWbY+tDBkBDFpsMlzfGIclABRJdCNM3ql+JKkqi1EI6GzViOKCqcYMqRlps+VtuhLoD5 UWz/NpnKfCt2qatasN41qjKo3BlIT1OVofSK6spGJfpB5yruAfcuyp/F2uvD4qupU9MU 5YAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=d7GvD5Hf8tzx2V16UHtbEc4zSmsYhgs5namwMdUKQPg=; b=7k14jvqA82/MpDIq7cvmwBZDDYOm2t/fE2FALCi/9xgPl8H4G9edgKIZpzA9WABAFb LxS40Ro98qprWRkR8/+43ww8uGQi4An6FPJ5qQs5tTyXOwO7C82OZ9F8m8ID4kvARHNK A+kRQ+YyYleG/GzMKkzenIJEXGl9iNlo0MkzMP/9ylUje/aEvXpNQK8ParwcytYoCgcW T7qH0NIlFneHs1vDQz0WziBnUaRuaNIvCnNIfD4m4EZLRupQDWmVxiwICBvCy/wg3IjF 576z3N1dPBXFTNyJc0tP5cczpqMzcBA5V6ibWkUdV5xUZ2qDH9Q5c9GNgHEinv/SrW4p Vo9w== X-Gm-Message-State: ACgBeo0Jq0fxL+RhjRrpnV4xgZYtLZ6Y8KArQks0MoIe4EyXsvR2GceA FfLbb/B6/yI+gfnd8C6Av2slt1gQ3f8bog== X-Google-Smtp-Source: AA6agR6VOX0FP5IFx9rLPlxKuktifaZCc/3o6UZBEaQfuWiyiMm5mBEw4iXoGvfBDwtrfxXU17dgYQ== X-Received: by 2002:aa7:dd42:0:b0:440:916e:9a38 with SMTP id o2-20020aa7dd42000000b00440916e9a38mr4842487edw.302.1660889284012; Thu, 18 Aug 2022 23:08:04 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:03 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Jassi Brar Subject: [PATCH v1 01/19] mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:07:43 +0200 Message-Id: <20220819060801.10443-2-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, fix the error check, and return -EIO to caller. Cc: Jassi Brar Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/mailbox/bcm-flexrm-mailbox.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-fle= xrm-mailbox.c index fda16f76401e..bf6e86b0ed09 100644 --- a/drivers/mailbox/bcm-flexrm-mailbox.c +++ b/drivers/mailbox/bcm-flexrm-mailbox.c @@ -622,15 +622,15 @@ static int flexrm_spu_dma_map(struct device *dev, str= uct brcm_message *msg) =20 rc =3D dma_map_sg(dev, msg->spu.src, sg_nents(msg->spu.src), DMA_TO_DEVICE); - if (rc < 0) - return rc; + if (!rc) + return -EIO; =20 rc =3D dma_map_sg(dev, msg->spu.dst, sg_nents(msg->spu.dst), DMA_FROM_DEVICE); - if (rc < 0) { + if (!rc) { dma_unmap_sg(dev, msg->spu.src, sg_nents(msg->spu.src), DMA_TO_DEVICE); - return rc; + return -EIO; } =20 return 0; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6527DC25B0E for ; Fri, 19 Aug 2022 06:08:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346549AbiHSGIe (ORCPT ); Fri, 19 Aug 2022 02:08:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344745AbiHSGIH (ORCPT ); Fri, 19 Aug 2022 02:08:07 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A084C6536 for ; Thu, 18 Aug 2022 23:08:07 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id i14so6976699ejg.6 for ; Thu, 18 Aug 2022 23:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=8hlJvz8Cg/RSrujn6eg6W9O1c50l+s7v5Bap/Ro2DSs=; b=QpTQj96OHSBiF7tI4jxZPrwsWxnv4EMkhARwtlJprTIv0jkFZqhlyuPYYGl9KsPENl V2MRG7o8n1+53/ashGW+rbaOAwckPTDDZDNRLjDq7/V7AYlSfCrPfInQ9W6vxdbNp/wF ZRFqu6lJtWWZ75FOnCHvpGQtfg3P657Qk/k00u8/4fg2escTuXxi4US8QHzEhCkwf5ub oScgZsOAZ9OSr/s7CTzJOLQN1cMzXs2UdmC9xtl4D4MRU0C8CvYTVWQ4TkuTvaQFbonH BSXM8qdXESIWM1gpwM9CIahklf7IxLUpxK6WtBRkVSTcgKBgAzhi/jaloiDTsDuEUGHv 5Y6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=8hlJvz8Cg/RSrujn6eg6W9O1c50l+s7v5Bap/Ro2DSs=; b=rEXIUiH2gwQo+y/Ru1ETspsgxElE+lf7Rftq6GAwlAkZXoOVh6iZv5Bv2M+wh5Wm2v kVa0oGdVQLMrY1X/9qAYo+8f7HXMUrFj5NiYb1ew2zQpWWbpeaIdsdhh+fH0ueP5TUOa ErYvSEZuumJIx+s16InA+3c/P17JB/0/aAn2bNfszidFCkglT7RiJz5GDeqR7kYC6led WcafH5vDk3XwwJRwvZI2a0mApqaphbJt1/XgQzxrBexoWXpcPwMhp10kVxYiSagi5LHg EMF6y2F6LgK9thNIn9rZKFgsVqZM1FMMZIKYobc0VM2sRCbezXKz3L2/TOOV1BCN6iih /4VQ== X-Gm-Message-State: ACgBeo05QDf+PTxT3dxhwHtUE3VOpt8xCPAjNsPmRC5Qx3V4dm4rqFQk KFAizZNtM5ZbjXW2NPQmI6Q4E2Y/xE3WHg== X-Google-Smtp-Source: AA6agR7/JhpdOMPLzO6RkZBvrR6nCK3+sQ6xgvqtcn+PCOKPalLO6+fAFWB2nSXAP9dj6tiCFYn9Uw== X-Received: by 2002:a17:906:8b81:b0:733:183b:988e with SMTP id nr1-20020a1709068b8100b00733183b988emr3834146ejc.457.1660889285398; Thu, 18 Aug 2022 23:08:05 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:04 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Jason Gunthorpe , Leon Romanovsky , Christophe JAILLET , Kees Cook , =?UTF-8?q?H=C3=A5kon=20Bugge?= , linux-rdma@vger.kernel.org Subject: [PATCH v1 02/19] infiniband/mthca: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:44 +0200 Message-Id: <20220819060801.10443-3-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dma_map_sg return 0 on error, in case of error set EIO as return code. Cc: Jason Gunthorpe Cc: Leon Romanovsky Cc: Christophe JAILLET Cc: Kees Cook Cc: "H=C3=A5kon Bugge" Cc: linux-rdma@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang Reviewed-by: Kees Cook --- drivers/infiniband/hw/mthca/mthca_memfree.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniba= nd/hw/mthca/mthca_memfree.c index f2734a5c5f26..44fd5fdf64d5 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -189,7 +189,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev= , int npages, chunk->npages, DMA_BIDIRECTIONAL); =20 - if (chunk->nsg <=3D 0) + if (!chunk->nsg) goto fail; } =20 @@ -208,7 +208,7 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev= , int npages, chunk->nsg =3D dma_map_sg(&dev->pdev->dev, chunk->mem, chunk->npages, DMA_BIDIRECTIONAL); =20 - if (chunk->nsg <=3D 0) + if (!chunk->nsg) goto fail; } =20 @@ -482,8 +482,9 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mth= ca_uar *uar, =20 ret =3D dma_map_sg(&dev->pdev->dev, &db_tab->page[i].mem, 1, DMA_TO_DEVICE); - if (ret < 0) { + if (!ret) { unpin_user_page(pages[0]); + ret =3D -EIO; goto out; } =20 --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70703C25B0E for ; Fri, 19 Aug 2022 06:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346029AbiHSGI2 (ORCPT ); Fri, 19 Aug 2022 02:08:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344838AbiHSGIJ (ORCPT ); Fri, 19 Aug 2022 02:08:09 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64F9FC6B60 for ; Thu, 18 Aug 2022 23:08:08 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id b16so4449921edd.4 for ; Thu, 18 Aug 2022 23:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=go4dvEqia6V/fZxmN51/sJtBvXxxyfCPi+dAy/HXyXo=; b=VxLm9bmVN54BCjUabUuzJyntx78WSMGA2ScgHljGmX3yILIHDVDSu2s0h+thyaO1Ba jvHV2pGGsVHOKDF0NdcKYiMGa3bobPAyASxUneQRAM+Wyiwt/1RX8NDYqrb0j0SslK/q jBa7mJKpuu6Pw1p+OgpqLLBUK3SNuNNRcWgvuAKxUEekniP54XKnBvpBxQRQ2HwGFX0u tS7VjIKeSNj7GVWjukpdyX1KISPAceqw4LruTTThMrJ1DDKtQPTzKEyw4VTmywtR9SiQ nL8z6ujP/0/c+BrjZtSULCy2vI94RIzOj2RkAeztN44jZ/ErtZnExFzmfiE99c9SyP8Z wWBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=go4dvEqia6V/fZxmN51/sJtBvXxxyfCPi+dAy/HXyXo=; b=FNXCJe3mJZpGl4KAVXq60E7hA/LcwcVtTyJ/AdKiAdbfhSfQvGtV+N8P5A9GPeaZBb UStrC0sUOCfjahsr9PyU5LAiBvd4rIKd/5SspEvh8Apyrfb3kMvGVX85/+stQdewbybW YRj6ndisrVdtiqhjz+zIwdTNHOG7D6/Sw0tBQEORgCYJTazkJZrz1tf7vlNacwTyq9Rb OAZBxhqALKhO0AadXr40ToJ7l8vHoGP0sKKHf1LhGIm1xBnPyj3PEhm07lH4VpEcL1nc zJjVqKs27CqR3HxLcsvGxV/e77VyvghNgtsPictbWz43VcUC1l9sK/xGPlCSXTb7Sj/O KTXA== X-Gm-Message-State: ACgBeo1xXAaVflwx4ZE2rB4VtWqxg+W13yy7GxlbdOKhLaK2OYXerdUW k7ChNEY9LhSWNmId35ZHtUUdzp506RNxAA== X-Google-Smtp-Source: AA6agR7BwaAHixNpkd8Ns0nUFUt0FNO6JJuhrJ7FCouUDH1Yr+TV7FDsA5OE27Loqn8SJ2gAZJW3sg== X-Received: by 2002:a05:6402:450c:b0:443:6279:774f with SMTP id ez12-20020a056402450c00b004436279774fmr4934547edb.11.1660889286796; Thu, 18 Aug 2022 23:08:06 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:06 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Sebastian Reichel Subject: [PATCH v1 03/19] HSI: omap_ssi_port: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:45 +0200 Message-Id: <20220819060801.10443-4-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, in case of error return -EIO to caller. Cc: Sebastian Reichel Cc: linux-kernel@vger.kernel.org (open list) Signed-off-by: Jack Wang --- drivers/hsi/controllers/omap_ssi_port.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controll= ers/omap_ssi_port.c index a0cb5be246e1..b9495b720f1b 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c @@ -230,10 +230,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch) if (msg->ttype =3D=3D HSI_MSG_READ) { err =3D dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents, DMA_FROM_DEVICE); - if (err < 0) { + if (!err) { dev_dbg(&ssi->device, "DMA map SG failed !\n"); pm_runtime_put_autosuspend(omap_port->pdev); - return err; + return -EIO; } csdp =3D SSI_DST_BURST_4x32_BIT | SSI_DST_MEMORY_PORT | SSI_SRC_SINGLE_ACCESS0 | SSI_SRC_PERIPHERAL_PORT | @@ -247,10 +247,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch) } else { err =3D dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents, DMA_TO_DEVICE); - if (err < 0) { + if (!err) { dev_dbg(&ssi->device, "DMA map SG failed !\n"); pm_runtime_put_autosuspend(omap_port->pdev); - return err; + return -EIO; } csdp =3D SSI_SRC_BURST_4x32_BIT | SSI_SRC_MEMORY_PORT | SSI_DST_SINGLE_ACCESS0 | SSI_DST_PERIPHERAL_PORT | --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E5FBC25B0E for ; Fri, 19 Aug 2022 06:08:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346447AbiHSGIj (ORCPT ); Fri, 19 Aug 2022 02:08:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344900AbiHSGIL (ORCPT ); Fri, 19 Aug 2022 02:08:11 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6FC7C6CC4 for ; Thu, 18 Aug 2022 23:08:09 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id s11so4417877edd.13 for ; Thu, 18 Aug 2022 23:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=OzHUmQwcd+nCjF20f8h6cgiTVwPuicRa6w7QZAA1SIg=; b=YvXzy4ZZy1mdY4EMhepxkx1ON9GYFpmRW9Ft40fg5ySPmER4WpPEAyH3L2RPcRsDzn E3fbrhOX1RZ6y3tlBQK1gEOw3s81guyqOtbmH27tahaoKKVBaXeNpEHk6YF11vQlUI4y GJnFXYkXFW6nvVO8SaIE+GRZ1PupQN3KqmS/i5opp1YE2pZzKO8Fiilwqy6WRK0ij+M1 pu2ShCoE+5XhledK85vKM0BQXjbtLuuesDCNfsvvfiMVj+UfZ6ghPG8gzgGa0P/3cHAe lapqf0KVRt2y3d06Mam60j47THi3xFU81mHpIEcUU33+bd+tpRGo+dBzZLdB1iqy/wxF 4fwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=OzHUmQwcd+nCjF20f8h6cgiTVwPuicRa6w7QZAA1SIg=; b=Rrt3++RgYnd5BB2N6QkPdOXTV/4cSvsIoYPvjoTu/XE6kd4qA9ds318o08SBP3X0SP 2okeNteubC9S1a2VaRZSoAgIKcNJ/qtwsd9QhPZQRGlsTivDkrhR9a7L4ZOt2/G/0nkT zr6+HXYOyWTWYk27D6zchjqcBwpOyKr5i4o0Vbxk2J4CHISX6EC9ulabYxCEBJqgXmLx E4/GQOnF8RJ3VylOs2X+59liJurcndE23EJ77rPCxrHbDt7ac1tU+m2c5zLYnadzTSKy 4MSW4M77LBqs/aMLyYXPoEUTLCYrZ5yqmaXzTlcCukEY5HGltgRxSVmdgL+sTQdQI1rp oHgQ== X-Gm-Message-State: ACgBeo2EQkWzRQFFosV0IJRkdV6VR9cJZqaVzhxXtuC+QTf3Rj9De34b d0+J7BkgyemjlRyBkc5aWpGWL2wC3d3Hcg== X-Google-Smtp-Source: AA6agR5DmMBvK+oUIDsQEG+pVfZgLO3Ld7GCkKqrInhA0LiEoWlC+RNyND2neXiQETWHpQprWlyS9g== X-Received: by 2002:a05:6402:42c3:b0:43d:682f:c0ca with SMTP id i3-20020a05640242c300b0043d682fc0camr4885929edc.334.1660889288038; Thu, 18 Aug 2022 23:08:08 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:07 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Maxime Coquelin , Alexandre Torgue , Philipp Zabel , Christophe Kerello , Cai Huoqing , linux-mtd@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 04/19] mtd: rawnand: stm32_fmc2: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:46 +0200 Message-Id: <20220819060801.10443-5-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, in case of error return -EIO. Cc: Miquel Raynal Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: Maxime Coquelin Cc: Alexandre Torgue Cc: Philipp Zabel Cc: Christophe Kerello Cc: Cai Huoqing Cc: linux-mtd@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang Reviewed-by: Christophe Kerello --- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/= stm32_fmc2_nand.c index 87c1c7dd97eb..a0c825af19fa 100644 --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c @@ -862,8 +862,8 @@ static int stm32_fmc2_nfc_xfer(struct nand_chip *chip, = const u8 *buf, =20 ret =3D dma_map_sg(nfc->dev, nfc->dma_data_sg.sgl, eccsteps, dma_data_dir); - if (ret < 0) - return ret; + if (!ret) + return -EIO; =20 desc_data =3D dmaengine_prep_slave_sg(dma_ch, nfc->dma_data_sg.sgl, eccsteps, dma_transfer_dir, @@ -893,8 +893,10 @@ static int stm32_fmc2_nfc_xfer(struct nand_chip *chip,= const u8 *buf, =20 ret =3D dma_map_sg(nfc->dev, nfc->dma_ecc_sg.sgl, eccsteps, dma_data_dir); - if (ret < 0) + if (!ret) { + ret =3D -EIO; goto err_unmap_data; + } =20 desc_ecc =3D dmaengine_prep_slave_sg(nfc->dma_ecc_ch, nfc->dma_ecc_sg.sgl, --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BCFAC25B0E for ; Fri, 19 Aug 2022 06:08:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346561AbiHSGIp (ORCPT ); Fri, 19 Aug 2022 02:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345268AbiHSGIM (ORCPT ); Fri, 19 Aug 2022 02:08:12 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28AE723F for ; Thu, 18 Aug 2022 23:08:11 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id kb8so6993326ejc.4 for ; Thu, 18 Aug 2022 23:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=zxM42Y9uEm9HYeKUiC4xFIG7yPyezX+CS6v5K5nZU8U=; b=DP1gLMIPVWB7ZYRop6oPt9NMumqgtsCGEOsM4vtsybhCRs5Dzp0CsQyLxargAIZINe ODmtV6u0iTI76C8ByXG7V1u+ccKF2e4qad3XsUzDIL6hye4OHE21JrXHHI932pE31adz R5XPcDmOIlBlW11EAcwZZ7lNflcuox+CFV9XjBDIN+0uCxGBFeyNFx2ldpUzzJncXSE0 1qtTuvw6sM8xrgjoFNXPjTWjVc/9E1DWxISdgmYV5jaFfPcDxncJ6b7lwd3QEA0UaswE kDGyILqBu+97OQjN5PmYrcF4nGuApHE1R3j50OpsFP7F3eX1tJg1XxbfZIv3QdZxdek/ 84fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=zxM42Y9uEm9HYeKUiC4xFIG7yPyezX+CS6v5K5nZU8U=; b=08Y5u+r5Zd7kTGCj4urtUaA/TXR/5whchVIpz56yvsuf9Eick3WA90QiadIkDTZoKX PFXN/cGKCOuiANIrjWGX3oTt9tw1NM1V5pOG8gII+bWIDxMwnHDVvcBbZgAaRkg857it z44pg/iqOEUwnnPzSLbqV51Scvmi7Owps026p7jhJJUIveJgKduas9LHJOKT/gIsROot Rigr52wC0FEw9gHeY35DXhYBlCUO6Z4sz4b0HP7Lyi0zzL7unD67bVflsvYB5J1oBlzc eQx5sDpLcwDymF+poYKfajwlVL/V1SASJwJSCrpdy+MOqI05LhuatJEZdKChkUhcPUyG Er1w== X-Gm-Message-State: ACgBeo2792JA5mL7GlnffrgqZgjDV/10IbyVDTfrJ55EKajE4cExMGt9 37jfcK44mlGLEv4uSyEJfRlxewDiP+qndg== X-Google-Smtp-Source: AA6agR7AxvNaR5kMACgc+5EvILcU4znfyr/yCo9fq+C5k8P8mQOI0CDjA9l2YlHqPOv1CkuTKAdmLQ== X-Received: by 2002:a17:906:5d07:b0:738:b86d:df3d with SMTP id g7-20020a1709065d0700b00738b86ddf3dmr3767679ejt.617.1660889289504; Thu, 18 Aug 2022 23:08:09 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:08 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Maxime Coquelin , Alexandre Torgue , Philipp Zabel , Christophe Kerello , Cai Huoqing , linux-mtd@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 05/19] mtd: rawnand: marvell: Fix error handle regarding dma_map_sg Date: Fri, 19 Aug 2022 08:07:47 +0200 Message-Id: <20220819060801.10443-6-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, in case of error return -EIO, also add the dma_unmap_sg as rollback on the following error. Cc: Miquel Raynal Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: Maxime Coquelin Cc: Alexandre Torgue Cc: Philipp Zabel Cc: Christophe Kerello Cc: Cai Huoqing Cc: linux-mtd@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/mtd/nand/raw/marvell_nand.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/mar= vell_nand.c index 2455a581fd70..d9f2f1d0b5ef 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c @@ -865,13 +865,19 @@ static int marvell_nfc_xfer_data_dma(struct marvell_n= fc *nfc, marvell_nfc_enable_dma(nfc); /* Prepare the DMA transfer */ sg_init_one(&sg, nfc->dma_buf, dma_len); - dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction); + ret =3D dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction); + if (!ret) { + dev_err(nfc->dev, "Could not map DMA S/G list\n"); + return -ENXIO; + } + tx =3D dmaengine_prep_slave_sg(nfc->dma_chan, &sg, 1, direction =3D=3D DMA_FROM_DEVICE ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); if (!tx) { dev_err(nfc->dev, "Could not prepare DMA S/G list\n"); + dma_unmap_sg(nfc->dma_chan->device->dev, &sg, 1, direction); return -ENXIO; } =20 --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB2FEC25B0E for ; Fri, 19 Aug 2022 06:09:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346603AbiHSGI5 (ORCPT ); Fri, 19 Aug 2022 02:08:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345200AbiHSGIO (ORCPT ); Fri, 19 Aug 2022 02:08:14 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90EF42186 for ; Thu, 18 Aug 2022 23:08:12 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id dc19so6944308ejb.12 for ; Thu, 18 Aug 2022 23:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=eWEeXziGUOdEI5oNKy03c0myTReCFeg7Foyw+1lcRrk=; b=C9BTh0YcOoOM+BaJ2jk5zMccdNL47XP+7S5376uY+xgH6uRxcyHeCmDoyhhrIffsc0 mIeT1wFHo/21wfMQbD0fKh1NjqQs2sb3ZrmSP2JMItCcYlbBxIx1TADQiRTcyosNM9tw +FyZd7QOH81Dme/UxmvamfsGx0WScUC/ViWAgVMozeJatq0kX/BSs7Iez1wV60pEjUBD xJfvpv9cn2tJZGwRA9tqEblawThl932jNqLX+yGMqxvkERGnh6xSR3hlOKURMhgcr2y8 JHYrsxeUt4r8Ee0D1OGfHo6HRsXUNFvRQhC89MqeC/3cT/mua8iAVdzF4VSGrLtY/6c2 6aYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=eWEeXziGUOdEI5oNKy03c0myTReCFeg7Foyw+1lcRrk=; b=qN0TunTAnTNWmz41W1EmXOUYG5z/9mwdXLBygp/xE8/4GcoOlAKAEQ5HhEZM2p/Fm1 SRzHT50nuU7G2s8q81+RKZt57M+37UUpd62O56YwnretDTQod67kapzg0Lfflgy5MuXj AWANMGrvqH6P+5cWbAsXapURUsnua+skqj6iw8X2o8+RSvp4qbSnDS4FzQEA1P8uyJ95 hDkYc0qeIjerQycXpvy1Z+PWN6xUOKNP3z9Dp/X1umTcZmhI/9jP0si9TurW0o439zdP v2hC0JNXdWtsGkdyNgBizmb7k+dpT7dCg/fqNkj7mWMIz6DrDW0UKBvxlrajmuUhgNby /JXA== X-Gm-Message-State: ACgBeo275UQt8zKShAoc4HK7Abu8C6Cvlj5a7+yN5VHa5YCMVvUqng2+ hMB4jzb46muabGb2M3g9x34uELLSsS1ZaOr8 X-Google-Smtp-Source: AA6agR47/tWuHZ8ns6fn80zPTh504eMTVk+51+SP8s7pyX37EYo602cuTfFZaMo2I/nNiLw/xYzREw== X-Received: by 2002:a17:907:2c5b:b0:73c:5bcb:8eb2 with SMTP id hf27-20020a1709072c5b00b0073c5bcb8eb2mr2422858ejc.38.1660889290951; Thu, 18 Aug 2022 23:08:10 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:10 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Alan Stern , Kishon Vijay Abraham I , Alexey Sheplyakov , Stephen Boyd , Weitao Wang , Matthias Kaehlcke , Arnd Bergmann , linux-usb@vger.kernel.org Subject: [PATCH v1 06/19] usb/hcd: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:48 +0200 Message-Id: <20220819060801.10443-7-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Greg Kroah-Hartman Cc: Alan Stern Cc: Kishon Vijay Abraham I Cc: Alexey Sheplyakov Cc: Stephen Boyd Cc: Weitao Wang Cc: Matthias Kaehlcke Cc: Arnd Bergmann Cc: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/usb/core/hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 94b305bbd621..90dd32a24e5b 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1474,7 +1474,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, stru= ct urb *urb, urb->sg, urb->num_sgs, dir); - if (n <=3D 0) + if (!n) ret =3D -EAGAIN; else urb->transfer_flags |=3D URB_DMA_MAP_SG; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3156C25B0E for ; Fri, 19 Aug 2022 06:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346585AbiHSGIu (ORCPT ); Fri, 19 Aug 2022 02:08:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344867AbiHSGIO (ORCPT ); Fri, 19 Aug 2022 02:08:14 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 562D162F9 for ; Thu, 18 Aug 2022 23:08:13 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id kb8so6993479ejc.4 for ; Thu, 18 Aug 2022 23:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Af+4xj435h7tYd148SgfWr1zA59+PnWfK6elz89ZgLM=; b=Xd8NAKNiubTfxSsUtmJumEPpCI6vYOF5EL7eEqsASLzToqEfPk6XzX5naT+z+HYz8I 1w53N+2KRQhMMbNho1wRRAHnHctpEyn+ZAZ+My+y94GnQ5BUud/SCly6Wqagaak6riGw VJXb180ImFH4mR4mo9owoXe/iiPOaEVE/QR7+wSIyjKVsRC6G/DI8OyjSBRW5Ayh2bkn O1tiHylgbNmwwQh68r5Aw8twy4PJFSp+KXlV8SJ/KXety+QEl+w1NfyMTG+JMF9b+oyx jE0UjBp39Rp78xg0g9guNVRyW5aG3Fb4qMhoEcrZPddQOIZtkz1omaYtCVqpw/Z4oEwE JWUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Af+4xj435h7tYd148SgfWr1zA59+PnWfK6elz89ZgLM=; b=XZ5w1Vva6llrW+zAKbzofuKZ654lL/Fy9WhsLY/u7iSCIsFRPnyBdxCKEi6PvUupHi gtiXaVPeIFHCTUZC1z56Vl208fdQrrhfOJLJz97Bi0BffICEN6nWWzxQRBZMQeyyOSqB i93OqkrdsUcJ3vd/GXj8oA5xR3L+ePFCKHVVEwzsVtVFOUM68t3HOg0LMfHcSvhIFIBe fZyMoI8uMoRY+5/UgO2b11cUyJmNgV7s/XNOvnA0K8eFpwU7OXD2Q+bdTKbFkn+r+DQK VKJyQaj0B+V3svJJ3XxNRJJBFgxzcusgcGk0/uRF/qBG5aD5pnJsjXJahVhMuJTGlZDQ zxvQ== X-Gm-Message-State: ACgBeo35Ah4HLLT/H6hoo0fUElaZO8UiCUgShQ1Uc69VEKzU5YdgVzr5 lBPVpq6bVdGgv83qIhU00bFLgLfuLBrk+pyA X-Google-Smtp-Source: AA6agR6s6z8H4PJAO2ZxVq5Iz7zKjhRBNrkLvhyCmREGjaDozeybRofTqZW61aHl+9y+8xWxNaWEhw== X-Received: by 2002:a17:907:da2:b0:731:60e4:2261 with SMTP id go34-20020a1709070da200b0073160e42261mr3844241ejc.679.1660889292785; Thu, 18 Aug 2022 23:08:12 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:11 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Corentin Labbe , Hans Ulli Kroll , Linus Walleij , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 07/19] crypto: gemin: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:07:49 +0200 Message-Id: <20220819060801.10443-8-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Corentin Labbe Cc: Hans Ulli Kroll Cc: Linus Walleij Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang Acked-by: Corentin Labbe Reviewed-by: Linus Walleij Tested-by: Corentin Labbe --- drivers/crypto/gemini/sl3516-ce-cipher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/gemini/sl3516-ce-cipher.c b/drivers/crypto/gemi= ni/sl3516-ce-cipher.c index 14d0d83d388d..34fea8aa91b6 100644 --- a/drivers/crypto/gemini/sl3516-ce-cipher.c +++ b/drivers/crypto/gemini/sl3516-ce-cipher.c @@ -149,7 +149,7 @@ static int sl3516_ce_cipher(struct skcipher_request *ar= eq) if (areq->src =3D=3D areq->dst) { nr_sgs =3D dma_map_sg(ce->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL); - if (nr_sgs <=3D 0 || nr_sgs > MAXDESC / 2) { + if (!nr_sgs || nr_sgs > MAXDESC / 2) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend; @@ -158,14 +158,14 @@ static int sl3516_ce_cipher(struct skcipher_request *= areq) } else { nr_sgs =3D dma_map_sg(ce->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE); - if (nr_sgs <=3D 0 || nr_sgs > MAXDESC / 2) { + if (!nr_sgs || nr_sgs > MAXDESC / 2) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend; } nr_sgd =3D dma_map_sg(ce->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE); - if (nr_sgd <=3D 0 || nr_sgd > MAXDESC) { + if (!nr_sgd || nr_sgd > MAXDESC) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgd); err =3D -EINVAL; goto theend_sgs; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9583C28B2B for ; Fri, 19 Aug 2022 06:09:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346544AbiHSGJE (ORCPT ); Fri, 19 Aug 2022 02:09:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344838AbiHSGIb (ORCPT ); Fri, 19 Aug 2022 02:08:31 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E74AF6342 for ; Thu, 18 Aug 2022 23:08:16 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id gk3so6973794ejb.8 for ; Thu, 18 Aug 2022 23:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=yWNMa8gEmIcjnbw10IXxxPNQFxmc0oHgvkM31hQzFRc=; b=CdNssv8VREdsltNyexSeWPxtCS+nM5OPHWwJ/DSZPjxo9HvCIhCPo4pIEnMVin3ocB lIoNLX+272S7PDpn/zyspH5zx2u/9uwxomOxtZWEDkeXwXo6Lb2Fs55Fp6IrcVytGCTH iMlwQ1Gh6l8DySPqf4b5z72BI0EvCpqMRcNeNq5ywdG1jkwv2900Cb5TUF8EhHMcD71y 4XYHW2G/mqKVWCNEZEXVz8jUi4aZlclonPEMvTQGQ8S2GOrxTNummF5KE4t/5hZ/CrnS q+BsiH4mAo3zpQ/LeDXYGDft/0J84YQnjLSMw6AwmbKjILi02+f4XTqjlOtwJ6cV0Agu j2lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=yWNMa8gEmIcjnbw10IXxxPNQFxmc0oHgvkM31hQzFRc=; b=CIimxW1HxRDp3V093+/Hyks3LiCm/bKbCz5geJA7Qkwr9eTfoSPWeIMWpSMGO9tBnR PieziFsLRvp14+MdymTbWhNi5rpD1TM8aTxAKOSOKtDfTtslfedfJDbmR3LOKtEC7fLo 0+YrOmOwBUCTuAxxEXML4eTkgW6gbzMH1MdZaOEDeV74m46SVkPN6zU7yzFRGPWaWsoX U3ENkPF1DrkcxCICwpgMLehVrS65lw29xBUK1e78m9lqIPhcTEj5NC6Y8YOEkSihNdyi MmCH4+1ouSTzq0lp6CbzNyn675KMSYF0bWLuOKVJzfDhCZZtFW4TBJqw36hpZxDyT0t8 3CIw== X-Gm-Message-State: ACgBeo1XY0vPbLtBRUKQtY5obf4a8de6a3GcktKL4VqsggkyCR95V6v6 VZQKOQK2lVxn8Qyr5H6yRIeuwszEpF+duD7e X-Google-Smtp-Source: AA6agR5mnj3Lntlfg+nOscK9RMkuTgHH3g812bGxQFy1YxoIMbulcNh2VlnvdCAgFkRskbSY09yKWw== X-Received: by 2002:a17:907:6d06:b0:731:5809:ec67 with SMTP id sa6-20020a1709076d0600b007315809ec67mr3867186ejc.195.1660889295385; Thu, 18 Aug 2022 23:08:15 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:14 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org Subject: [PATCH v1 08/19] crypto: sahara: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:07:50 +0200 Message-Id: <20220819060801.10443-9-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, it returns the number of DMA address segments mapped (this may be shorter than passed in if some elements of the scatter/gather list are physically or virtually adjacent and an IOMMU maps them with a single entry). Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/crypto/sahara.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 457084b344c1..bb71aac30e2c 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -487,13 +487,13 @@ static int sahara_hw_descriptor_create(struct sahara_= dev *dev) =20 ret =3D dma_map_sg(dev->device, dev->in_sg, dev->nb_in_sg, DMA_TO_DEVICE); - if (ret !=3D dev->nb_in_sg) { + if (!ret) { dev_err(dev->device, "couldn't map in sg\n"); goto unmap_in; } ret =3D dma_map_sg(dev->device, dev->out_sg, dev->nb_out_sg, DMA_FROM_DEVICE); - if (ret !=3D dev->nb_out_sg) { + if (!ret) { dev_err(dev->device, "couldn't map out sg\n"); goto unmap_out; } --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 279B7C32771 for ; Fri, 19 Aug 2022 06:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242023AbiHSGJJ (ORCPT ); Fri, 19 Aug 2022 02:09:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346486AbiHSGId (ORCPT ); Fri, 19 Aug 2022 02:08:33 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A706C1EACB for ; Thu, 18 Aug 2022 23:08:18 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id r4so4436223edi.8 for ; Thu, 18 Aug 2022 23:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=5gJkiTR+kGRLtGgVd47CicF8SNS8UY18L9XUin4OY2Y=; b=QJC4IJlQ/pc53o+D11jC62z/3fhQ5SotDCbo5C5orgKX9ZXhpy96Sv15+GEhv6RP+G mrqO821gPfoqnBrUz0Pt1mdZBC7U0OIwQtGUeZHKroZt28gFxn1D4vhYT4/byi/4ACXS 0Oc1eKBWrKxD+RJKPtaXXTHwrCsqVefIZIni+tQ/LWKxtsrTymFXxkO2gJgQ99ozgjKX iGxLfMcpdIkhS9BbSA9nwWk2FjQCCCsKcEmYr+qDKpN1Gq2yXXILl8CF25Aw5O0Jy7bR kQcpxeHm18TpANDu7+SIayoh6NdnbkYKG6/jA5VrzTKRTWDRCMl9o+vUxdzr5Rkhq2ha xXDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=5gJkiTR+kGRLtGgVd47CicF8SNS8UY18L9XUin4OY2Y=; b=14bCcaNGeNKXJOKE101wz5B/nvVFOy11LliCwqer+jWFoyDHVUYWbgqoWUgv2qnAAU tnUHTBBEVFgeoN1c5/rOMH4UaCqbuteisURyGsBKybpYFo+IEXLAALnMm/k0jkMps+0j IeIgNPfyh/JLjzCcRsGZGpYa+Bw4n782CSKl0R3JAQm2EHq/1uhDUZ2forgzx8cutWRH 1IuEch0oh7DXRCohnAK+q2oRqkvEmXrn3JhI14JNj4V1TiicaWxGeej8oip5Ytkqa1BR NX9roS5j/WRcme6s7prRHA9+0UaFFK+qB3mhnjqjlbXtA7O9EqtE3SXFjICOXtFaGQ+5 eMPQ== X-Gm-Message-State: ACgBeo1meSx5dALSkbnzZJzXgwggGw8z0UC4C0ipsCK9AtF+32+d6lDg b2A9AUcW0XatDci2LfxQplAnFtKYVNkfV+YV X-Google-Smtp-Source: AA6agR75k14pdaTAK1S0BCFB7OdMaf69W99USHyOlv8hrS6V7Mr9HiIOc/Y2kMJ6Foo2b8Ui1jyy/g== X-Received: by 2002:a05:6402:191:b0:445:cf66:25c5 with SMTP id r17-20020a056402019100b00445cf6625c5mr4865875edv.58.1660889298374; Thu, 18 Aug 2022 23:08:18 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:17 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Thara Gopinath , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v1 09/19] crypto: qce: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:51 +0200 Message-Id: <20220819060801.10443-10-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, fix the error check and return -EIO to caller. Cc: Thara Gopinath Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/crypto/qce/aead.c | 4 ++-- drivers/crypto/qce/sha.c | 8 +++++--- drivers/crypto/qce/skcipher.c | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/qce/aead.c b/drivers/crypto/qce/aead.c index 97a530171f07..6eb4d2e35629 100644 --- a/drivers/crypto/qce/aead.c +++ b/drivers/crypto/qce/aead.c @@ -450,8 +450,8 @@ qce_aead_async_req_handle(struct crypto_async_request *= async_req) if (ret) return ret; dst_nents =3D dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst= ); - if (dst_nents < 0) { - ret =3D dst_nents; + if (!dst_nents) { + ret =3D -EIO; goto error_free; } =20 diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c index 59159f5e64e5..37bafd7aeb79 100644 --- a/drivers/crypto/qce/sha.c +++ b/drivers/crypto/qce/sha.c @@ -97,14 +97,16 @@ static int qce_ahash_async_req_handle(struct crypto_asy= nc_request *async_req) } =20 ret =3D dma_map_sg(qce->dev, req->src, rctx->src_nents, DMA_TO_DEVICE); - if (ret < 0) - return ret; + if (!ret) + return -EIO; =20 sg_init_one(&rctx->result_sg, qce->dma.result_buf, QCE_RESULT_BUF_SZ); =20 ret =3D dma_map_sg(qce->dev, &rctx->result_sg, 1, DMA_FROM_DEVICE); - if (ret < 0) + if (!ret) { + ret =3D -EIO; goto error_unmap_src; + } =20 ret =3D qce_dma_prep_sgs(&qce->dma, req->src, rctx->src_nents, &rctx->result_sg, 1, qce_ahash_done, async_req); diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 3d27cd5210ef..5b493fdc1e74 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -124,15 +124,15 @@ qce_skcipher_async_req_handle(struct crypto_async_req= uest *async_req) rctx->dst_sg =3D rctx->dst_tbl.sgl; =20 dst_nents =3D dma_map_sg(qce->dev, rctx->dst_sg, rctx->dst_nents, dir_dst= ); - if (dst_nents < 0) { - ret =3D dst_nents; + if (!dst_nents) { + ret =3D -EIO; goto error_free; } =20 if (diff_dst) { src_nents =3D dma_map_sg(qce->dev, req->src, rctx->src_nents, dir_src); - if (src_nents < 0) { - ret =3D src_nents; + if (!src_nents) { + ret =3D -EIO; goto error_unmap_dst; } rctx->src_sg =3D req->src; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F7A4C25B0E for ; Fri, 19 Aug 2022 06:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346660AbiHSGJN (ORCPT ); Fri, 19 Aug 2022 02:09:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346524AbiHSGId (ORCPT ); Fri, 19 Aug 2022 02:08:33 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 908D7220F7 for ; Thu, 18 Aug 2022 23:08:21 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id w19so6976875ejc.7 for ; Thu, 18 Aug 2022 23:08:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=F5ABPES53yBnNM8KMYaOoJGq6EgoilQgsIQzRxOn8jI=; b=YF9RDOWfoLh1rKjWTYgYRo+wyiZASSeVrPh9Z70zeRcDdGmQB3lQT7MPFxJXHqlu+M osfBgwSm98SFRcW8wlbcC7vK6DmPb6aKRn5z/Ba0K+qEsnyMxYg1jcgWV/2UyxnAwnEQ MfGHH3SoCYX9kM1xEFBRZz8Agb6CqTD6RyOE2yaoiVP4theIZp9an+m8AbQDehTGukSB Mw1rEXirxBiuAaZdwCSx1VXbv8ye39ic9KrRi5ONSIGqKYv+5bYHnFf6XmZDwRcd9+p5 eLj5546HBAkV+eB0IWBmdPR3FZ/FoBJM9JLkOtFcVcq4yhGfO9gnyqJDB5QpSv1uibdN CnYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=F5ABPES53yBnNM8KMYaOoJGq6EgoilQgsIQzRxOn8jI=; b=xO0/ZKjcyQDxkK26uEbiuj/y+ba4fxz3vkZ5UGlAV9w75dxTR37pj9tsPuDCIuotfd 3nGlblbEKvnpmUiJqXOowEWOsIOX4sHvXeXgUYCHNFCyNC1hYgjsOQijjbtNl6Rk8DkS jiUnuYbIB9THeuyOpTxVQqYT4cFYFfhKkW+XA5ZmsliAEQpVTzUVVOPeZLc+lvtKxAn1 lTNuseIijO/0I/1eywkBItViQM2C8buHD+x+a/aThMhliUnYyVBZcYBbqQHzbqrP8qBl xQkMnix3trLzRTwzs+jWUGY9KGbR08H7hu4qAGOVvP4d6TLiStvrMTZLfAhXhV/OSO13 lzKA== X-Gm-Message-State: ACgBeo33iT18DwUs5LHLMaHS55F64x6ze1wLmKZ5ZXOCdwAg5zuW6R0O tctk0nN6j8iMd/3lXutwKmaNph16oF46TvNF X-Google-Smtp-Source: AA6agR7vpe7XwFhB8bWIG6ZHamJs/kMyizsVnVvMQeylgjrGCsHiyms0BKMF09snW3nldFzq48Vd7A== X-Received: by 2002:a17:906:8a55:b0:73b:d8ea:6c2b with SMTP id gx21-20020a1709068a5500b0073bd8ea6c2bmr3343732ejc.114.1660889299632; Thu, 18 Aug 2022 23:08:19 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:19 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Corentin Labbe , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH v1 10/19] crypto: amlogic: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:52 +0200 Message-Id: <20220819060801.10443-11-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Corentin Labbe Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-amlogic@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang Acked-by: Corentin Labbe Tested-by: Corentin Labbe --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/a= mlogic/amlogic-gxl-cipher.c index e79514fce731..af017a087ebf 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -177,7 +177,7 @@ static int meson_cipher(struct skcipher_request *areq) if (areq->src =3D=3D areq->dst) { nr_sgs =3D dma_map_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL); - if (nr_sgs < 0) { + if (!nr_sgs) { dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); err =3D -EINVAL; goto theend; @@ -186,14 +186,14 @@ static int meson_cipher(struct skcipher_request *areq) } else { nr_sgs =3D dma_map_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE); - if (nr_sgs < 0 || nr_sgs > MAXDESC - 3) { + if (!nr_sgs || nr_sgs > MAXDESC - 3) { dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs); err =3D -EINVAL; goto theend; } nr_sgd =3D dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE); - if (nr_sgd < 0 || nr_sgd > MAXDESC - 3) { + if (!nr_sgd || nr_sgd > MAXDESC - 3) { dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd); err =3D -EINVAL; goto theend; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 292FDC25B0E for ; Fri, 19 Aug 2022 06:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346706AbiHSGJY (ORCPT ); Fri, 19 Aug 2022 02:09:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346547AbiHSGIe (ORCPT ); Fri, 19 Aug 2022 02:08:34 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 155B52B1A3 for ; Thu, 18 Aug 2022 23:08:23 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id r4so4436349edi.8 for ; Thu, 18 Aug 2022 23:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=MhAvXvgOuGSOVU+0SPcQuNTLcHtqNw2MpFIs8bOelUY=; b=f1tj4JkACZwBuG1Wd+y0k1B4j6b/vQPV1oCFLCsOqpOzuvijbn46KCd4KAXf/gvHeT XnpTd7mcqNqk5iwk1SY78oocOtcdS+Dq6qelGImkzEHazqVx1Y1P+k7knppAWoAoFsl5 B5sK2IXanUQbA5/cLSBhvAO397/VqKN6N1xRxmopNPjByZqJxc/zUhyAko0OLnMZtJb+ Mu5E9sw6kXxGG9G9C6si7nPick00J5XPuXyCaSuzub0JlHbPgwoVJyEOeXJ63uqBMJJ+ /yrQud7vigK7bG19ieiUVjWP5H+YBFHkYoVdPD1O0xNPcGOJ0cu8KcZpNdA4Dqi9WG/Y aXkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=MhAvXvgOuGSOVU+0SPcQuNTLcHtqNw2MpFIs8bOelUY=; b=udiFeMhVDbiTUbosbvnkFhzMZZr71+kkY9E0zURwSMud24P7RqcfP2j2s1IsDD0v+o SqvskM2mPsppPSNjk6PDckiq03y/NRZzaHzFZ45/Bx99F7x43rU/zxnn9iFhmkB9L9/x 0BQjoLt548lg4lhsI1R95l24cHJ3xPUkmgoFCjA9tV/y1+jSRNORafeNxMvXckAaZDhE req5pSezl4sfV+ZQWrqaPwt+W46TC+T73fXyAzRIhW2av0OEUBtbMbsJeoUQew5md4vo pZy/LDCXkMfsuLPjBIPLL68g/Gs3EpYlQV/A4TC+UYOwDpo3fJxwdTDcsW4Zohy3VObh WYtQ== X-Gm-Message-State: ACgBeo1LZu2Y6DsBvhi5GJvOPlgh88yBCO0Bu02IE71Tm9T7cDeF9WMN Nf500wf6FdoMGT0x3SCMTXs1rL5hUY5uUxp7 X-Google-Smtp-Source: AA6agR45x+III0utWJMPQr/7+FfJG2j+q5Z9JwzMPorUnxjE8X9vtPiF+PHoDO1FO0i+zG5jcgjANA== X-Received: by 2002:a05:6402:27c6:b0:43d:6fab:146e with SMTP id c6-20020a05640227c600b0043d6fab146emr4785049ede.376.1660889301413; Thu, 18 Aug 2022 23:08:21 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:20 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Corentin Labbe , Herbert Xu , "David S. Miller" , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Dan Carpenter , Minghao Chi , Peng Wu , Alexey Khoroshilov , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v1 11/19] crypto: allwinner: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:53 +0200 Message-Id: <20220819060801.10443-12-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Corentin Labbe Cc: Herbert Xu Cc: "David S. Miller" Cc: Chen-Yu Tsai Cc: Jernej Skrabec Cc: Samuel Holland Cc: Dan Carpenter Cc: Minghao Chi Cc: Peng Wu Cc: Alexey Khoroshilov Cc: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-sunxi@lists.linux.dev Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 6 +++--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 4 ++-- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c b/drivers/= crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c index 74b4e910a38d..be7f46faef7e 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c @@ -208,7 +208,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine= *engine, void *async_req =20 if (areq->src =3D=3D areq->dst) { nr_sgs =3D dma_map_sg(ce->dev, areq->src, ns, DMA_BIDIRECTIONAL); - if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { + if (!nr_sgs || nr_sgs > MAX_SG) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend_iv; @@ -216,13 +216,13 @@ static int sun8i_ce_cipher_prepare(struct crypto_engi= ne *engine, void *async_req nr_sgd =3D nr_sgs; } else { nr_sgs =3D dma_map_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE); - if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { + if (!nr_sgs || nr_sgs > MAX_SG) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend_iv; } nr_sgd =3D dma_map_sg(ce->dev, areq->dst, nd, DMA_FROM_DEVICE); - if (nr_sgd <=3D 0 || nr_sgd > MAX_SG) { + if (!nr_sgd || nr_sgd > MAX_SG) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgd); err =3D -EINVAL; goto theend_sgs; diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/cr= ypto/allwinner/sun8i-ce/sun8i-ce-hash.c index 8b5b9b9d04c3..0e6843ec197f 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c @@ -389,7 +389,7 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, voi= d *breq) cet->t_asym_ctl =3D 0; =20 nr_sgs =3D dma_map_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE); - if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { + if (!nr_sgs || nr_sgs > MAX_SG) { dev_err(ce->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend; diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c b/drivers/= crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c index 910d6751644c..fdcc98cdecaa 100644 --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c @@ -232,13 +232,13 @@ static int sun8i_ss_cipher(struct skcipher_request *a= req) nr_sgd =3D nr_sgs; } else { nr_sgs =3D dma_map_sg(ss->dev, areq->src, nsgs, DMA_TO_DEVICE); - if (nr_sgs <=3D 0 || nr_sgs > 8) { + if (!nr_sgs || nr_sgs > 8) { dev_err(ss->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend_iv; } nr_sgd =3D dma_map_sg(ss->dev, areq->dst, nsgd, DMA_FROM_DEVICE); - if (nr_sgd <=3D 0 || nr_sgd > 8) { + if (!nr_sgd || nr_sgd > 8) { dev_err(ss->dev, "Invalid sg number %d\n", nr_sgd); err =3D -EINVAL; goto theend_sgs; diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/cr= ypto/allwinner/sun8i-ss/sun8i-ss-hash.c index 36a82b22953c..fcb8c41cc957 100644 --- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c +++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c @@ -527,7 +527,7 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, voi= d *breq) rctx->method =3D ss->variant->alg_hash[algt->ss_algo_id]; =20 nr_sgs =3D dma_map_sg(ss->dev, areq->src, sg_nents(areq->src), DMA_TO_DEV= ICE); - if (nr_sgs <=3D 0 || nr_sgs > MAX_SG) { + if (!nr_sgs || nr_sgs > MAX_SG) { dev_err(ss->dev, "Invalid sg number %d\n", nr_sgs); err =3D -EINVAL; goto theend; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A21BC28B2B for ; Fri, 19 Aug 2022 06:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346673AbiHSGJU (ORCPT ); Fri, 19 Aug 2022 02:09:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346541AbiHSGIe (ORCPT ); Fri, 19 Aug 2022 02:08:34 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F416C27FE8 for ; Thu, 18 Aug 2022 23:08:22 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id s11so4418533edd.13 for ; Thu, 18 Aug 2022 23:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=yl5HiiR2MPe2XyH1/doPUo0B2YDbGGjz3okpkZe5cBw=; b=Pum09WMTwwxEjt2KUmuHdzsnw7jsrL2CGGbZKHZtJltod/goEUD2MgIyKf/4WJV/T1 cQz+JQmSIefTBwgyBfj5ouRMUurR9EDpUbMaGkIvzowZYpIf2JJ+KaD/CFkT7p1XtUmF w6FA9YMnMGjmaO+g5lfrO6RSNhpxTXzwncFD7ZQs9lQ7hKOU03Uu3zlKw907272MIrTO sZOoeR2QMYVYCRsXW5Ba2ThEarlsMGTpqqpg2NaXx+6oyk79f3Sdib9TaK6yMfKinuwU z7D8O8/Nu0ARAFM1SVr8uFuwVGQk+DM0+9q+UCuiGnS5rKb1qp3HX3GYi2vptAUb3gpg meJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=yl5HiiR2MPe2XyH1/doPUo0B2YDbGGjz3okpkZe5cBw=; b=7FYl/HlVRtm9xN7630jM0ultE4k/eW8d7i+dJO1BVKVLblBA5fZl1qIsV4cdjXWbu8 3m7lyam78v2NvlLOC26c8STfOcGJkGZ89g317ZXgB41VSWExNzUygde0tEGrCiU0kc8s 0f1QUF2qJfWGVVK8K4+6X/0EajocNmysYUKqKlzTeOD6iwg/5AD+YFhzH7M8maQoUpl6 hit+bFDznbRt3FV8uUN3x7b1/tWuc7+udPF5MbSafYwZOI1TH/VGVJWAtqa9ebMSUfWf bhmfVfMRcEOk2Zq4pj0Nianvt1KrYhEMeLO/JMhlJX8y5DwQTOFQ/gQOpUpnzgtiNm/3 jwJg== X-Gm-Message-State: ACgBeo10a1Y10Wg/ySN3wRMC0eES1nYRdrEQaX+P3fhajdVzoqEKkSOV Seq/ZAEtgu9ButNT54MJZaMo0tWFz4fwRGQy X-Google-Smtp-Source: AA6agR6owE29frw+Rwu3yMsFrK1lO2my17nU39OeqLDkxjzvWeYJxzu4oKmOGSnitPmZDiyCB61g2A== X-Received: by 2002:a05:6402:1d4e:b0:43d:9822:b4d1 with SMTP id dz14-20020a0564021d4e00b0043d9822b4d1mr4910403edb.212.1660889302387; Thu, 18 Aug 2022 23:08:22 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:21 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Gilad Ben-Yossef , Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org Subject: [PATCH v1 12/19] crypto: ccree: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:54 +0200 Message-Id: <20220819060801.10443-13-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, and dma_map_error is not supposed to use here. Cc: Gilad Ben-Yossef Cc: Herbert Xu Cc: "David S. Miller" Cc: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/crypto/ccree/cc_buffer_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc= _buffer_mgr.c index 6140e4927322..9efd88f871d1 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -274,7 +274,7 @@ static int cc_map_sg(struct device *dev, struct scatter= list *sg, } =20 ret =3D dma_map_sg(dev, sg, *nents, direction); - if (dma_mapping_error(dev, ret)) { + if (!ret) { *nents =3D 0; dev_err(dev, "dma_map_sg() sg buffer failed %d\n", ret); return -ENOMEM; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19038C25B0E for ; Fri, 19 Aug 2022 06:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346532AbiHSGJb (ORCPT ); Fri, 19 Aug 2022 02:09:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346551AbiHSGIf (ORCPT ); Fri, 19 Aug 2022 02:08:35 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F37C5766D for ; Thu, 18 Aug 2022 23:08:25 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id e13so4416674edj.12 for ; Thu, 18 Aug 2022 23:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=G8Fa6mUqYf/+9pmayD/JU97JJ5c1rtwFfoeWsGQuVn0=; b=Wa2YE/4iuBwhCxA/2sLMGxafjNWNp8R5Y5GvUjuw9r41tK8Wcx/EKw+2H+1/Veywgc LJQ+v73iCinphAmOCiTHHaEKqV/BmvDch1rJUfPEwxvwKNwdrPi+huIrtM6hsfPxL7Xy G4M4VWQQtWxc4APJhsQYsWSK8VbHm9A8N6uK9gEIJWWGfMFQTt29abAUXGvjYldp/mVM 94gjFIMTn7ap2pgpIGqnx52ill0+26zTXJXgcU/wShPvvVBMOYCaaF+IznVZ8dp9H0mm o8C017Lq9lLvphIDql/BSULFsWxxtUVWCEcpxQD5tJ7WGxyFvAzt7it8+bgrQSrODYgd RbYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=G8Fa6mUqYf/+9pmayD/JU97JJ5c1rtwFfoeWsGQuVn0=; b=USYaU2QqYob4a2JV1XwrkVGz2ZgIpidLaio9Zs2MeOACMlk1RrPdRhg2zQsnFgf+WE bEj5xc2zh95AGZnm5rt2lUKQ4b1lEqlM5BxvjPzJem9b3wbth/os88s72ZqvB3MsD6iN XrGOrVsMZahyLOOXfLWirDOODOrzSS7fCSJR2oB8pGYo6TtqeCizpnMiHphSVCXtvZZ1 MBoHB7WgBwKhjI4LS4gkq6v0A6wVWOVEHU96ubz0pKH4zXmGxPKLwibFLs14EQ5SCAQg aHu/QviV8PgW2W5w+JZcxuwqQ5uAGgFdc6LHUu4IrkRvisWP0TOauBFK3PIqc1J48J1a VT7A== X-Gm-Message-State: ACgBeo17hgH0i4mFNrQQmcscfLoXI4n43xSG4TU0gRpE0mvjLVaFcO7c IYy5L6zzxGM70+bUwopJzctbpZ0lousSZ12c X-Google-Smtp-Source: AA6agR6BA7zdNhkAb4nZuW4FclGhlWv4j7pNqcDrjThensw54HFO+0JNP9+6BQjpOTtkHWznXs4rkA== X-Received: by 2002:a05:6402:d57:b0:445:fba7:422d with SMTP id ec23-20020a0564020d5700b00445fba7422dmr4929146edb.138.1660889303801; Thu, 18 Aug 2022 23:08:23 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:23 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Alexander Shishkin Subject: [PATCH v1 13/19] intel_th: Fix dma_map_sg error check Date: Fri, 19 Aug 2022 08:07:55 +0200 Message-Id: <20220819060801.10443-14-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Alexander Shishkin Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/hwtracing/intel_th/msu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/= msu.c index 6c8215a47a60..b49237d56a60 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -931,7 +931,7 @@ static int msc_buffer_contig_alloc(struct msc *msc, uns= igned long size) =20 ret =3D dma_map_sg(msc_dev(msc)->parent->parent, msc->single_sgt.sgl, 1, DMA_FROM_DEVICE); - if (ret < 0) + if (!ret) goto err_free_pages; =20 msc->nr_pages =3D nr_pages; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A3A1C25B0E for ; Fri, 19 Aug 2022 06:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244288AbiHSGJi (ORCPT ); Fri, 19 Aug 2022 02:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346586AbiHSGIu (ORCPT ); Fri, 19 Aug 2022 02:08:50 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F5343205E for ; Thu, 18 Aug 2022 23:08:25 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id w19so6977111ejc.7 for ; Thu, 18 Aug 2022 23:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=uyVgJ1+wrRmHQHbLzZkCEtfs58onJoTrNiUjQMfsElE=; b=f3ub8wfqCgXsggOvDWD7YThPKgrQeLezsFWKD7JNkZ3NYPkF/zkY4vAH0PC9ooLlIV +Nv1wNrwX1TEdf41/OZ/mYc8ZPAfjLOmXHiHS22B3UipI/WfElbUy1GnqWk3JdF+3hJM oLtLucbIjIWaN8g/0t2pnie/9fSrHb2rwZpOKu6ZUrzAzXVB53r3P90TgPASNXySSi4n KlAopEV24PQb4LwVa4zKwjDb3ZocplL2VhymDCdnMaM/v1H9z3eYuOiuG4ia3J5MvJoT 3FUe9jAWCUd/iR5ECx8ub0totX2Yz6yfEu/5Ykvho2wkFU+TQ0OtUeAYX10G7QUfheH1 gNyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=uyVgJ1+wrRmHQHbLzZkCEtfs58onJoTrNiUjQMfsElE=; b=PVB0UjRCSGCb4Aeu/Eh1xui4GFtwS2+Wi/UMsXKoYWzHIS82ciWfwRRzFZZSUj39Qc vEDsBwvzkPAzDKuY8I4D0QNiO4qFqozPaJf6RrFMHxQijaHiWzM2R9k81+TPe7Kv5umg ll+mjJgATwZqniXgyKcyhMrLbXgW8be6QBjinHzEYEo5b2thsk+i/TnCSTM4zwtpKrc2 HeUb6ntC93iIFjZZMUms1Rf3gIHGtG9CMRJEgAKS1deH1XBsWexInKx9Xfn7uUzacNMH eeGiaGbIt1vhn0h+xOtxRQZDFIijVwEmeWLIEnsJIEg7zJOdmMFOexuNDZ8MZNAwyOZD +Ipg== X-Gm-Message-State: ACgBeo3oOVRiJR+msCBt1FH3Bkxn0hMfZuS2/LfwXDxnw0zG1jHZxYrM h6Bj/oPPgSPk9Q/26cs+fdS6YYLO5puiOuat X-Google-Smtp-Source: AA6agR4Gf40tIGiWcPwKD63vJim8JzCFckhdiFEXDhfFVJm+iVYsHTK6yhdRYuWPjreL/3DreBK2xg== X-Received: by 2002:a17:907:a0c7:b0:734:e049:1af6 with SMTP id hw7-20020a170907a0c700b00734e0491af6mr3787864ejc.439.1660889304810; Thu, 18 Aug 2022 23:08:24 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:24 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , linux-nvme@lists.infradead.org Subject: [PATCH v1 14/19] nvme-rdma: Fix error check for ib_dma_map_sg Date: Fri, 19 Aug 2022 08:07:56 +0200 Message-Id: <20220819060801.10443-15-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" ib_dma_map_sg return 0 on error. Cc: Keith Busch Cc: Jens Axboe Cc: Christoph Hellwig Cc: Sagi Grimberg Cc: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/nvme/host/rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 3100643be299..d70bccbcba3e 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1551,7 +1551,7 @@ static int nvme_rdma_dma_map_req(struct ib_device *ib= dev, struct request *rq, =20 *count =3D ib_dma_map_sg(ibdev, req->data_sgl.sg_table.sgl, req->data_sgl.nents, rq_dma_dir(rq)); - if (unlikely(*count <=3D 0)) { + if (unlikely(!*count)) { ret =3D -EIO; goto out_free_table; } @@ -1574,7 +1574,7 @@ static int nvme_rdma_dma_map_req(struct ib_device *ib= dev, struct request *rq, req->metadata_sgl->sg_table.sgl, req->metadata_sgl->nents, rq_dma_dir(rq)); - if (unlikely(*pi_count <=3D 0)) { + if (unlikely(!*pi_count)) { ret =3D -EIO; goto out_free_pi_table; } --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59E43C28B2B for ; Fri, 19 Aug 2022 06:09:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346778AbiHSGJs (ORCPT ); Fri, 19 Aug 2022 02:09:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346595AbiHSGIv (ORCPT ); Fri, 19 Aug 2022 02:08:51 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3D7B356C5 for ; Thu, 18 Aug 2022 23:08:28 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id w19so6977160ejc.7 for ; Thu, 18 Aug 2022 23:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=5dgh0mRNVGiAT981rc+BiMLlWYrkrNgUD8IdfprQkqA=; b=W5WMmy+an0THIibSKrr3bcWg4gjuYgGgd72fP/ALycZ+7+Pa0SfJykH8cr7EcbmFhQ azhFHI6OBwkWgPK6ZpMfr9Om11xd/5LqmEKxVhg6en5ryfV3ZPV0QgnB/7UKMtO/gzan Z//ONWSeVL4TaZpjD7YmjJpps5VFk3z3CfxYVx6wMJO+M1Zh3Z8STOFwIoBCOpMHiSjD zkZxUsCZuHqQ59thjGYOvNcdcAZ2nY00mRORym3v7Fjb2NKri7WM4bq1wuFPX9Tcg/3l EkQaSVW96Onm/Rz+9wbCm9GDcPL9ONsaT1bt5Ymm4kl/5J+miqTeNDeNblYHym9NerAd ghVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=5dgh0mRNVGiAT981rc+BiMLlWYrkrNgUD8IdfprQkqA=; b=QM42p8ziDQdn3TUFCAs1aWb4xu0PhHcHXo+7ySATAk5CSVwGhAampnOB50FQLqoDxk xfPULX3jHZ+CXPcyo11oIzsdk8eqN2VGU6DqLfPs9A4tnvCB7ref+Rmv5/uveoiw6kqb vXAah3Fykq8SEMjWjQdZpWbfqL+q4fViqHzS5DEJbUdTgicTN/dx8Gw184AbNe2rUnuV Rf2NS/tVeTR2hBcnFAqY6MCZryC6u2zVTGEGhGYqt2HAQES9nSUOHqN3/DzkPYvRo0l0 d7ZuCi93rs2Jf3rptPl12vDj54rTbwWQGPChby485XQIyy3foBSWS91aTUibAyS7N1nX LjeQ== X-Gm-Message-State: ACgBeo1vQo2TpBYzbLuMidVX0reSTFgxJ0lT+c3sx+rbywj5slRkntB6 ir0g940ZlhTJcIX/5omoL5vu4f7ROeHmv3JO X-Google-Smtp-Source: AA6agR4w+Ar1X7e4t7akiH3do+1BZFgD+ksEGLVKvjAc15jlYgFPvVhkpqkmoIXMBHOiP6bq4bnzGQ== X-Received: by 2002:a17:906:730c:b0:730:da74:3453 with SMTP id di12-20020a170906730c00b00730da743453mr3837859ejc.270.1660889306078; Thu, 18 Aug 2022 23:08:26 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:25 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: James Smart , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , linux-nvme@lists.infradead.org Subject: [PATCH v1 15/19] nvme-fc: Fix the error check for dma_map_sg Date: Fri, 19 Aug 2022 08:07:57 +0200 Message-Id: <20220819060801.10443-16-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error, add missing check. Cc: James Smart Cc: Keith Busch Cc: Jens Axboe Cc: Christoph Hellwig Cc: Sagi Grimberg Cc: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/nvme/host/fc.c | 2 +- drivers/nvme/target/fc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 127abaf9ba5d..95050f2e0a06 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2616,7 +2616,7 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct re= quest *rq, WARN_ON(op->nents > blk_rq_nr_phys_segments(rq)); freq->sg_cnt =3D fc_dma_map_sg(ctrl->lport->dev, freq->sg_table.sgl, op->nents, rq_dma_dir(rq)); - if (unlikely(freq->sg_cnt <=3D 0)) { + if (unlikely(!freq->sg_cnt)) { sg_free_table_chained(&freq->sg_table, NVME_INLINE_SG_CNT); freq->sg_cnt =3D 0; return -EFAULT; diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index ab2627e17bb9..3749ca28860b 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c @@ -2089,6 +2089,11 @@ nvmet_fc_alloc_tgt_pgs(struct nvmet_fc_fcp_iod *fod) ((fod->io_dir =3D=3D NVMET_FCP_WRITE) ? DMA_FROM_DEVICE : DMA_TO_DEVICE)); /* note: write from initiator perspective */ + if (!fod->data_sg_cnt) { + sgl_free(fod->data_sg); + fod->data_sg =3D NULL; + goto out; + } fod->next_sg =3D fod->data_sg; =20 return 0; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 672F2C25B0E for ; Fri, 19 Aug 2022 06:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346768AbiHSGJn (ORCPT ); Fri, 19 Aug 2022 02:09:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346592AbiHSGIv (ORCPT ); Fri, 19 Aug 2022 02:08:51 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3ABC32EF2 for ; Thu, 18 Aug 2022 23:08:27 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id s11so4418756edd.13 for ; Thu, 18 Aug 2022 23:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=YRpdcaJ4r7VRT3/3i///gd/6IhC/k0ujvr195lrn9Lk=; b=dClsiF8/qquQhG3mTRGsAcbFLgD7BqtxZiG5igXl/tQMnq+DIwQy/n4vJcD74RLzhw rNVuNVbIvfInB6tJAS5ktMLxANQJGYE6tJI++8kwlx0MVpwVvVVWeLX3wqXy/pUq/vXt tuaEzz4CONIC6f00x7TfopRSRwbdWOp3IFUXi28obkv0HnhgvKxHPPtyVoGuwuJlTrPU U6R37X9gq0WGh3ocZ2O7O/uBLi1rv88P3Xx/+z22g4XfE4rMpDNDuXTscJg9kFy7ThsW B/QjpE6PfUWQ8nozGKYds8I2ZhfTUHWPYdiX+rLRN2Xl9LqofiZaXGXKggMh6F+JH6K+ KTQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=YRpdcaJ4r7VRT3/3i///gd/6IhC/k0ujvr195lrn9Lk=; b=vvIru6Lv4m1I1giN8nBgLs8gITtsqCCemXXL6D9U59LGvWM6lZ/V6zlWYM250JNVGX YTD37z4X/VTiYpthpKDiOkefOuAsZLdwqemtvNvXtTkyCZK6gie8LXOi37DKMeroqWhI HWJ/74sc+TqSUEVi/ACNYuR+oTI/cYB00iylOl1X7slFjlU6Rk9KlSCJy2K2vjinvtE3 mKDPUEbTzgKehu4rRelh5O/drIYg8CZgtwD4ytdWOrd4HFCXeZeVRFisfU5EmR+Dx8RQ A978daoVj7Xwq2LISe8z9BQITgZuKWyqzxUUeeCZg/OawrkkW9pA+8zJJffZxHJxdDty NxdA== X-Gm-Message-State: ACgBeo0PJ62IKU0eQH5kKGhntuGvm25f9CcLzEWYNQMYMVDOQzoeuqJg eJ4ehtk1xTL5mwEB/1antJOOnN0ebxz0DQbM X-Google-Smtp-Source: AA6agR76uQfP+U8eTNPUlQ2cBewfTbiI+d5oZ56Bftjg4YGeZIcjKUqA7r+vN12AdAnt1dgkLq5dSg== X-Received: by 2002:a05:6402:4411:b0:437:b723:72 with SMTP id y17-20020a056402441100b00437b7230072mr5001891eda.38.1660889307277; Thu, 18 Aug 2022 23:08:27 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:26 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [PATCH v1 16/19] scsi/qlogicpti: Fix dma_map_sg check Date: Fri, 19 Aug 2022 08:07:58 +0200 Message-Id: <20220819060801.10443-17-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add the missing error check for dma_map_sg. Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/scsi/qlogicpti.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 57f2f4135a06..8c961ff03fcd 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -909,7 +909,8 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, stru= ct Command_Entry *cmd, sg_count =3D dma_map_sg(&qpti->op->dev, sg, scsi_sg_count(Cmnd), Cmnd->sc_data_direction); - + if (!sg_count) + return -1; ds =3D cmd->dataseg; cmd->segment_cnt =3D sg_count; =20 --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0796C25B0E for ; Fri, 19 Aug 2022 06:09:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346787AbiHSGJx (ORCPT ); Fri, 19 Aug 2022 02:09:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346634AbiHSGJD (ORCPT ); Fri, 19 Aug 2022 02:09:03 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 675AE24BD7 for ; Thu, 18 Aug 2022 23:08:30 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id i14so6977916ejg.6 for ; Thu, 18 Aug 2022 23:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=nqYvJwkPyhGWw+zs1FTUvC87NAtZOXSQ3RqOerl0RrE=; b=fiuYIZZteuYPevbr1jm85MKPd5CH4K37Lu4s75kvjuumhqQNFhJ070aTDxlo8rddZH i+SLkKBHFRU3yeK8DOPjK8gtAyWibQEuXvJ8eP9IHSg/vRac7WgRAymuwe9+ZobzdLFN PxR14UjJQUSwykQ7XL3yHLtQ4vIhSNDABxzAuHo0Xmno3tATOenqwGlRgr3r4XJhrefO D77YhaODhrbxs5QaR/3iE+LF0FPSh9Ss0hm+76qlQi4ZO1yohXeMcT2tciZbP4zjCTWi ITu0PHFBTopfTT6ON3pqalPDv/DMSFxCS4bqvqWVeoQK7zX6Pur+EiSUCX6SB3Idc4bs hj3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=nqYvJwkPyhGWw+zs1FTUvC87NAtZOXSQ3RqOerl0RrE=; b=GDZaU947nwywFIEBeyezAm0vOkAcqhtKBBd9rdp1/9plyz8RDbFPHYKpD7F01BhBpS L3ScGaMrtyFntTuRW8qeA4qAJK7j+cGoX4G6hJaPgubqE3BxqsA/zurXzUnyMnnQuyq9 j1hcVoAWHxhKvzB+dHsRj8jEoIB1zq+Xzc2rZN249MzQnryYYk/lyQIpuKIlo/SktBbV 6Yxr11aapeZSqJBioodiQSr2KAooycQwM+4ke++AogqJsoFsNnrdiT4sESKrLG/frNB+ JbCPUlr+Ge/+AOsmyKfA3tRto2HSkTd6lBiyyf0j6CxH4Bhmv/czlxyAAePzLONrZ+D9 0tzA== X-Gm-Message-State: ACgBeo1Gj8OYpF8g3XJaeV22pxWf+8I1AhBfOmtTZfD7mSunSewaGpEp OqHSYz5vh9zjBoM5cQHYuSjSrdUO6fQllH35 X-Google-Smtp-Source: AA6agR63MvipYuGx9P2SlYQNDL6T8+iUmE8z45ilOguyJ5frm1741Qd6zDL+S52D+AlEU7kMb3PpMg== X-Received: by 2002:a17:907:7628:b0:730:b755:4414 with SMTP id jy8-20020a170907762800b00730b7554414mr3907267ejc.11.1660889310244; Thu, 18 Aug 2022 23:08:30 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:28 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Ulf Hansson , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH v1 17/19] mmc: meson-mx-sdhc: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:07:59 +0200 Message-Id: <20220819060801.10443-18-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Ulf Hansson Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: linux-mmc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/mmc/host/meson-mx-sdhc-mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/meson-mx-sdhc-mmc.c b/drivers/mmc/host/meson-= mx-sdhc-mmc.c index e92e63cb5641..b32364f20c32 100644 --- a/drivers/mmc/host/meson-mx-sdhc-mmc.c +++ b/drivers/mmc/host/meson-mx-sdhc-mmc.c @@ -388,7 +388,7 @@ static int meson_mx_sdhc_map_dma(struct mmc_host *mmc, = struct mmc_request *mrq) =20 dma_len =3D dma_map_sg(mmc_dev(mmc), data->sg, data->sg_len, mmc_get_dma_dir(data)); - if (dma_len <=3D 0) { + if (!dma_len) { dev_err(mmc_dev(mmc), "dma_map_sg failed\n"); return -ENOMEM; } --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0DD9C25B0E for ; Fri, 19 Aug 2022 06:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346809AbiHSGKA (ORCPT ); Fri, 19 Aug 2022 02:10:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346640AbiHSGJD (ORCPT ); Fri, 19 Aug 2022 02:09:03 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C1B03E775 for ; Thu, 18 Aug 2022 23:08:33 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id j21so1601262ejs.0 for ; Thu, 18 Aug 2022 23:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=aWxibmll6dw/pqOCoi7TR4UJQijH/2FtimkTNrGyezk=; b=BvBSOSyw3iiv7zGvCap/WbdDf/oN0NTZE0qS3IMD0KNzeUdTvihvlvLMuuYitRZvE/ m91mX5BcHAzQzmFlYJ9XOMgeaKGEidyXAmrwZyN9tu4ux2wrV78lw/hrcbiXneJuZZEs cFVDStud4vcr2LzM4HQ3TqvwE4yXd75WYW32FPgqBEgFhe+MbOcln3OEbaJdLxL3OpmG yz4pjFzomcWQWZrGSR928lMeJDqYKk7nzXFR1WwiTdcleoICgdZczEbk4dE3ByCZ3W52 ZPE7HrzuhjQWRDJh6F1NgSQal4hinjGHUmETkoVL7jQYlECrig3h4g0k89jbgWMEWaBH njDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=aWxibmll6dw/pqOCoi7TR4UJQijH/2FtimkTNrGyezk=; b=kgALqT1AkS0wpRzwtgM4VlmJ9iZypfnjZvPvpuQ+mzeXmLvUfPTaIndY7uC3fYbPEn b6I7B0B1guEGUjcybQWRG4TfULaKYrx/nwpQHOjDYpBSmnO1rx+RUJ2euPUgBefiuXIe k/BDTQtev30b7tx5UWPdc6gr5gjj2AnBKjwT5x/p8SKANBEdIEaApRZ4WNYycYfzPZZ6 Wzly3fHqakNGh1ojV99ghVQyRJNz3JUh/POljeKNKHzNKLSYH4quVyM68i2YvL3pGYXa XeDTov9WnOSmYfTmIhhxiSCjle+n8IG6cZkOafggoJZy6QL1eDqRtzKe3esqO8XJjJVo 1oew== X-Gm-Message-State: ACgBeo3DeET0Xwhip6YGu+vWYiG6j/c/FRZij+RJWl64KvKD9p6Lti8K lT6wFZfoqrIQTbiIF2K9OEJ/cB9uaEWZutds X-Google-Smtp-Source: AA6agR4Iy4mG3WSo/+iV+l4otLH2sa6d2rwaJAQsAE1Z1Nuy5iTIHXL0YtgWK+Uf3LeX6Gm0YwCa4Q== X-Received: by 2002:a17:907:1c26:b0:730:960f:118 with SMTP id nc38-20020a1709071c2600b00730960f0118mr3868462ejc.650.1660889311411; Thu, 18 Aug 2022 23:08:31 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:30 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Paul Cercueil , Ulf Hansson , linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v1 18/19] mmc: jz4740_mmc: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:08:00 +0200 Message-Id: <20220819060801.10443-19-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Paul Cercueil Cc: Ulf Hansson Cc: linux-mips@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang --- drivers/mmc/host/jz4740_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index b1d563b2ed1b..666600055b06 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -308,7 +308,7 @@ static int jz4740_mmc_prepare_dma_data(struct jz4740_mm= c_host *host, data->sg_len, dir); =20 - if (sg_count <=3D 0) { + if (!sg_count) { dev_err(mmc_dev(host->mmc), "Failed to map scatterlist for DMA operation\n"); return -EINVAL; --=20 2.34.1 From nobody Fri Apr 10 20:20:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42977C32773 for ; Fri, 19 Aug 2022 06:10:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346556AbiHSGKF (ORCPT ); Fri, 19 Aug 2022 02:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346642AbiHSGJD (ORCPT ); Fri, 19 Aug 2022 02:09:03 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F073ECDD for ; Thu, 18 Aug 2022 23:08:33 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id z2so4457977edc.1 for ; Thu, 18 Aug 2022 23:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=MQQ5ueYXwF1mgVuBzhpDoSiarWWxcP+kFd0K52asQnw=; b=UJ8fUY4TBBq/TG6MOQupt3Ca8oMqHbkfKb3rW32eIJXKGf8rriXtcQuht5HRT+uI+b /1I/3QlQTBiYtQyoCjG3k8PmdewX1V/uYmtVT9QY4yVxm9VZ7arJUigNUV//Z6LZj1ts UP6L4uHCOc8l1xbbiZPLnLO9Lu3mj2x0J4S9A9ZshmFeIPMpzFFoGn4rIxOhHdCNlp3v ks8QLaHIx2sYfETf4glt1lcF4B1ty3UFK4WsMunfm8bv0UoPjy7V0NA5t4JFcwwU6z1y mvfHq/oAbzId5oj+M3S89Vds8ALHVVB/ojTU0sWRNMVajI/dW+sLa9z3o3F3pOPVYaBq 73hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=MQQ5ueYXwF1mgVuBzhpDoSiarWWxcP+kFd0K52asQnw=; b=YyVljrNnT/JpoDKYA+qf+joIJLsftt5GzdHK3GcwAKfMNUsYFGjHRxArG5K1gNRZNK jIbB1EyG5t+vM35htBQsl4mFQ1zMr6h3PdPvIhnDtUMuXLXcn8HkAivzzdygxnDfrbh9 nhp93BUdFLUcFxsqM01SX5wWIrFDJYhgVPLpS7vvoDjeKTg92VjRCBbZFe+A2iNWAODJ et5j+b3FauZpx7GAfCf9irOQy29MFEgUXXJIiQFVW6aw42vgyQ+EBb2EOffI9kXG8mcL Eupp+BTqKT7k5BNrVw5VxrIbUjaJQ9OMrxUYbONY9xc9HwISXyJ+Df6oOZZ1fv072XdF 7liA== X-Gm-Message-State: ACgBeo0zT9gGMy8Cwm5NSbkCjYlDrwrY9XuECg1oiRfIElRDnYw5iNn4 PrHFiM3qGNc8fv7hAShb0+D1b7cjW1PQ5DhW X-Google-Smtp-Source: AA6agR5qrhKSw7oa0pDZk68ViIpC2FB5ZmkkWaDCBIhx8mIj19+nf9D2Fwy8CN4MThe75Z3lcCNpuw== X-Received: by 2002:aa7:dd50:0:b0:440:3e9d:784 with SMTP id o16-20020aa7dd50000000b004403e9d0784mr4859887edw.195.1660889313038; Thu, 18 Aug 2022 23:08:33 -0700 (PDT) Received: from lb02065.fritz.box ([2001:9e8:143b:fd00:5207:8c7f:747a:b80d]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm1809660ejd.101.2022.08.18.23.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 23:08:32 -0700 (PDT) From: Jack Wang To: linux-kernel@vger.kernel.org Cc: Tariq Toukan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH v1 19/19] net/mlx4: Fix error check for dma_map_sg Date: Fri, 19 Aug 2022 08:08:01 +0200 Message-Id: <20220819060801.10443-20-jinpu.wang@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220819060801.10443-1-jinpu.wang@ionos.com> References: <20220819060801.10443-1-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dma_map_sg return 0 on error. Cc: Tariq Toukan Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Cc: linux-rdma@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jack Wang Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/mellanox/mlx4/icm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/etherne= t/mellanox/mlx4/icm.c index d89a3da89e5a..59b8b3c73582 100644 --- a/drivers/net/ethernet/mellanox/mlx4/icm.c +++ b/drivers/net/ethernet/mellanox/mlx4/icm.c @@ -208,7 +208,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, i= nt npages, chunk->sg, chunk->npages, DMA_BIDIRECTIONAL); =20 - if (chunk->nsg <=3D 0) + if (!chunk->nsg) goto fail; } =20 @@ -222,7 +222,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, i= nt npages, chunk->nsg =3D dma_map_sg(&dev->persist->pdev->dev, chunk->sg, chunk->npages, DMA_BIDIRECTIONAL); =20 - if (chunk->nsg <=3D 0) + if (!chunk->nsg) goto fail; } =20 --=20 2.34.1