From mboxrd@z Thu Jan 1 00:00:00 1970 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 4487EECAAA1 for ; Thu, 25 Aug 2022 20:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242770AbiHYUg2 (ORCPT ); Thu, 25 Aug 2022 16:36:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230285AbiHYUg0 (ORCPT ); Thu, 25 Aug 2022 16:36:26 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81566B56C5; Thu, 25 Aug 2022 13:36:25 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id r83-20020a1c4456000000b003a5cb389944so3331983wma.4; Thu, 25 Aug 2022 13:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=m4tEcGBACEGWaQEpUxdmWQR6J1Khyc3oluJxMJzdBgo=; b=N2fAhrsl+kv9ZYKhW5EJYguEcSWxvXTY54bQUjLprmAcyC8Pa4oIWZXv2vCW7XK24I hl9vRRFcXaUFvUSnB7MJmtdF8YRRYkL1ae2Xja7m2tThhuimRk0+anfJw1UAV7fpjscX sROzAb/6r8vu5B2GH36HZ3Tmn1qmCzeTz8aBfi3WzC0FdoiJ2t/C7OG6Bqgu8DBDFcRE SMpgZljWW6enGuPxxF7cmilQehbK/czz5o/Nx5bGDz6j+iEkhhoySaaISUzqTwG5I9p+ x5Phhdcjgh0mlWgWa7CSmPHetKPwnABLGOse9lGcbZLQSF67OvWd8mANePgcBA8pkM6i /ZTQ== 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=m4tEcGBACEGWaQEpUxdmWQR6J1Khyc3oluJxMJzdBgo=; b=JOHohJvWgZ9rq/XOcTrmKEgTMaQioDdz1ELL56iSl3hhS9I6577LeHqGITlioCtjZD NdZ9MCjNs0RA0rgp+M3BpbHRGBdZafdBY5u3Atb7qBhc823HL8BaWJcXYazPm8FJZruY +IdlNV4KJlTXIh6VFwcymHYb8VdQ9KVnY+FOAsrSzEWZsG5b2Kf7wPUihnA6uSzpSy6I hM+YWu5djZ2xAEEyX6OEaII/YeNyIGc10S+JTlJRzdap625BSTCvd7GyGurbA1CtA+WJ CEHOuf5lEWeOsQ3duVkcn/HxoOdM3iMZ4c5hER/b0MZVbUByJX6S+C16tj04ztHxUmvv EBjg== X-Gm-Message-State: ACgBeo28yaG4y8V97NB7rR0S3Mj9faHHoQGbqpTWFR1N7CC7afcrQrfW vmkImiLhHAdYimQDlX8Ot8Q= X-Google-Smtp-Source: AA6agR5nmXXz4cnhxS3dpy898DY4fWV2qphQL7t2YuAZhFtAOHTBLIUInnvIoHdSrPi8xqnPsqzwSQ== X-Received: by 2002:a05:600c:3c9:b0:3a5:c5b3:4bf with SMTP id z9-20020a05600c03c900b003a5c5b304bfmr9185791wmd.195.1661459784116; Thu, 25 Aug 2022 13:36:24 -0700 (PDT) Received: from kista.localnet (82-149-1-172.dynamic.telemach.net. [82.149.1.172]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c3b8400b003a608d69a64sm6328926wms.21.2022.08.25.13.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 13:36:23 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org, Jack Wang Cc: Corentin Labbe , "David S. Miller" , Chen-Yu Tsai , Samuel Holland , Dan Carpenter , Minghao Chi , Peng Wu , Alexey Khoroshilov , linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/6] crypto: allwinner: Fix dma_map_sg error check Date: Thu, 25 Aug 2022 22:36:22 +0200 Message-ID: <4734941.GXAFRqVoOG@kista> In-Reply-To: <20220825072421.29020-6-jinpu.wang@ionos.com> References: <20220825072421.29020-1-jinpu.wang@ionos.com> <20220825072421.29020-6-jinpu.wang@ionos.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Dne =C4=8Detrtek, 25. avgust 2022 ob 09:24:20 CEST je Jack Wang napisal(a): > dma_map_sg return 0 on error. >=20 > 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 > Fixes: 06f751b61329 ("crypto: allwinner - Add sun8i-ce Crypto Engine") > Fixes: d9b45418a917 ("crypto: sun8i-ss - support hash algorithms") > Signed-off-by: Jack Wang Acked-by: Jernej Skrabec Best regards, Jernej > --- > 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(-) >=20 > 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_engi= ne > *engine, void *async_req >=20 > if (areq->src =3D=3D areq->dst) { > nr_sgs =3D dma_map_sg(ce->dev, areq->src, ns,=20 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",=20 nr_sgs); > err =3D -EINVAL; > goto theend_iv; > @@ -216,13 +216,13 @@ static int sun8i_ce_cipher_prepare(struct > crypto_engine *engine, void *async_req nr_sgd =3D nr_sgs; > } else { > nr_sgs =3D dma_map_sg(ce->dev, areq->src, ns,=20 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",=20 nr_sgs); > err =3D -EINVAL; > goto theend_iv; > } > nr_sgd =3D dma_map_sg(ce->dev, areq->dst, nd,=20 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",=20 nr_sgd); > err =3D -EINVAL; > goto theend_sgs; > diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c > b/drivers/crypto/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, v= oid > *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 > *areq) nr_sgd =3D nr_sgs; > } else { > nr_sgs =3D dma_map_sg(ss->dev, areq->src, nsgs,=20 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",=20 nr_sgs); > err =3D -EINVAL; > goto theend_iv; > } > nr_sgd =3D dma_map_sg(ss->dev, areq->dst, nsgd,=20 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",=20 nr_sgd); > err =3D -EINVAL; > goto theend_sgs; > diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c > b/drivers/crypto/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, v= oid > *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_DEVICE); - 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; > -- > 2.34.1