From patchwork Thu Nov 19 12:38:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7656981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3771DBF90C for ; Thu, 19 Nov 2015 12:42:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6406E206A5 for ; Thu, 19 Nov 2015 12:42:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AEDC2069E for ; Thu, 19 Nov 2015 12:42:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzOVG-0000fv-Vk; Thu, 19 Nov 2015 12:39:54 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzOVE-0000Ne-1F for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2015 12:39:53 +0000 Received: by wmec201 with SMTP id c201so23528407wme.0 for ; Thu, 19 Nov 2015 04:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BxidqJaclWb7PuJFPIJ2M12ZMIQYVVg2SZcy0fd3N+w=; b=LSSp9CgE48m7Ttfe4b2GaQFCinea6cIkODRWooQIP8qFFtcBPiAHDTMQv4PEPcke// PQRU8bnwUAvCFCzWY8bOJpqG9ZCrCI7iLNN1Pdp38pZrqRtQoiKham8bJ844pRqveHPT 5QxWXGstzNjPIrPDXyZDiJH2uj9GXXU4HFxxwwkpNOxf4R85RcoEPG4k7vqtuTgLJbf7 QmMgQMiVbgF80DZzNv7d6wqT8jvev4RDtQQxRsIZnYtRQU2U+pvaZhJPk6GsSYf9MGMo JPH8q1zF4WYg7oAdG2DORLUDzfAH6PMc0XoZtItl2tJf4DRNsCyNGg3gAk4LYQD5vKpl QoOw== X-Received: by 10.194.58.142 with SMTP id r14mr9294551wjq.37.1447936769802; Thu, 19 Nov 2015 04:39:29 -0800 (PST) Received: from Red.local (ANice-651-1-376-123.w86-193.abo.wanadoo.fr. [86.193.8.123]) by smtp.googlemail.com with ESMTPSA id u134sm7059722wmd.0.2015.11.19.04.39.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 04:39:29 -0800 (PST) From: LABBE Corentin To: davem@davemloft.net, herbert@gondor.apana.org.au, jamie@jamieiles.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] crypto: picoxcell: set [src|dst]_nents and nents as signed int Date: Thu, 19 Nov 2015 13:38:18 +0100 Message-Id: <1447936699-26854-2-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1447936699-26854-1-git-send-email-clabbe.montjoie@gmail.com> References: <1447936699-26854-1-git-send-email-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151119_043952_390295_9F7825F5 X-CRM114-Status: GOOD ( 11.42 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LABBE Corentin , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The unsigned int variables [src|dst]_nents and nents can be assigned signed value (-EINVAL) from sg_nents_for_len(). Furthermore they are used only by dma_map_sg and dma_unmap_sg which wait for an signed int, so they must be set as int. Fixes: f051f95eb47b ("crypto: picoxcell - check return value of sg_nents_for_len") Reported-by: Dan Carpenter Signed-off-by: LABBE Corentin --- drivers/crypto/picoxcell_crypto.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index a9c6367..15b5e39 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c @@ -289,10 +289,11 @@ static struct spacc_ddt *spacc_sg_to_ddt(struct spacc_engine *engine, enum dma_data_direction dir, dma_addr_t *ddt_phys) { - unsigned nents, mapped_ents; + unsigned mapped_ents; struct scatterlist *cur; struct spacc_ddt *ddt; int i; + int nents; nents = sg_nents_for_len(payload, nbytes); if (nents < 0) { @@ -326,7 +327,7 @@ static int spacc_aead_make_ddts(struct aead_request *areq) struct spacc_engine *engine = req->engine; struct spacc_ddt *src_ddt, *dst_ddt; unsigned total; - unsigned int src_nents, dst_nents; + int src_nents, dst_nents; struct scatterlist *cur; int i, dst_ents, src_ents;