Message ID | 1478681184-9442-6-git-send-email-horia.geanta@nxp.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Herbert Xu |
Headers | show
Return-Path: <linux-crypto-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00A086022E for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:20:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5B5F28F7D for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA7E6290B0; Wed, 9 Nov 2016 09:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56DAD28F7D for <patchwork-linux-crypto@patchwork.kernel.org>; Wed, 9 Nov 2016 09:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbcKIJUg (ORCPT <rfc822;patchwork-linux-crypto@patchwork.kernel.org>); Wed, 9 Nov 2016 04:20:36 -0500 Received: from mail-by2nam03on0072.outbound.protection.outlook.com ([104.47.42.72]:2721 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752730AbcKIJUe (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Wed, 9 Nov 2016 04:20:34 -0500 X-Greylist: delayed 1072 seconds by postgrey-1.27 at vger.kernel.org; Wed, 09 Nov 2016 04:20:34 EST Received: from BN3PR0301CA0022.namprd03.prod.outlook.com (10.160.180.160) by MWHPR03MB2749.namprd03.prod.outlook.com (10.168.207.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Wed, 9 Nov 2016 08:47:48 +0000 Received: from BN1BFFO11FD007.protection.gbl (2a01:111:f400:7c10::1:194) by BN3PR0301CA0022.outlook.office365.com (2a01:111:e400:4000::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6 via Frontend Transport; Wed, 9 Nov 2016 08:47:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD007.mail.protection.outlook.com (10.58.144.70) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.707.3 via Frontend Transport; Wed, 9 Nov 2016 08:47:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:806; Count:13 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uA98lTXQ026193; Wed, 9 Nov 2016 01:47:45 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> To: Herbert Xu <herbert@gondor.apana.org.au> CC: "David S. Miller" <davem@davemloft.net>, <linux-crypto@vger.kernel.org> Subject: [PATCH 05/14] crypto: caam - fix smatch warnings Date: Wed, 9 Nov 2016 10:46:15 +0200 Message-ID: <1478681184-9442-6-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> References: <1478681184-9442-1-git-send-email-horia.geanta@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131231548676315400; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(36756003)(50466002)(33646002)(5820100001)(50986999)(76176999)(8936002)(189998001)(68736007)(77096005)(229853001)(104016004)(87936001)(85426001)(356003)(23676002)(50226002)(2906002)(4326007)(2950100002)(6916009)(110136003)(305945005)(47776003)(97736004)(69596002)(5660300001)(86362001)(7846002)(105606002)(81156014)(586003)(81166006)(106466001)(8676002)(626004)(6666003)(92566002)(2870700001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2749; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD007; 1:I3BUpPF9zSXX6VS1U47H4q7vmCRgMSTHSo491wo/8OtMT93Pam6MfM2mZpmjxLEdXQrtxTx+zi/bQ+82sd1/ySN/JMug8wQiGNvlWwn+bIf2EFwWkWHOBWz6IxRSsXev3pRrUoVN2ToIC9M/9aVVJeeufa8BFdenqTDv7Ot2QOEtvrYTDjpa7IyrSq4LcaxzTMUV7VITJbK6no45r0pKCFRATQiKsrh1bTmBlwz3MAnitUY5+jL7JZ3HvU2CSO/TmlHSGoTuPMmAGdwS2Z46F2H3S/oao8qAyu6ZBtLZQgzfQshgVRPZVu1b/jrcNQ8S95JtcW5njkgzAL+5iwi9xliIM+faGu3RLHHa8AU6Kzexuj8tfSoz44lbz+1/nHXUtLHp/PlXZ9pGWHQpJYyG72+glzVTJwOiYEeGMZhoTYiZjrF5V3Ic3ODd53kFeZN7g30U29LxdL8b9LTeD4d/x/L2rfj/MaXUehaQb4HWvnirwYlA/XyHyG8VuSRfI7FQxaTIHcDr1dliFysYBXM2Dbrju4g64v5zgh/ti9CkS3ipNiDlEOo+7PlMhawHOExFa2TnOpvyfSVBO0JI24nT9r8YEM7U9Qed66W+pAnaXQIEYR8fHQcp/Y89Wmglb5AX X-MS-Office365-Filtering-Correlation-Id: 2c3a28d1-3acf-4eab-0e08-08d4087d1491 X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2749; 2:vtLds1/RXTm3F6RZzfCphinUOMF3StfcUHwtWpaCttHX4QqGzca6Zlc9/T4EJO1DbGwSxkI2rpg7/ju9ECiqq0SWxDNJkztwLfb+AfaiOuX/ltkrIjjCVrItJp5NyTEqfc0Vi0jjqpFh0l77IPXQ/xXhnJhe0i5KNBC6lJuYntkqQRT2AYMdC36/abf30ebBb3/XtMtyJDBQJuJxN3aMGA==; 3:ali6PKQ0duzornqLAmOazRAmFBZtYDZUPHS/2yQH7niIUhezAotzn2gCoa8jB3n+ySDqImPUihvVnfXX08U4yCfCD0iATZj1FsgkWKyX39zewP1Vh7G+Mh/d5maLy9mvULpFeFrIQ34Pl1uTnPFQ2QWMcYfhZmgaPb6NS4y8OnevbfZhxrYhV5JgXgJ4ALYI5WH8XJOj8zR40Kw+WyPEH0dAEbl7jnqgeSZedshLiW/aKvd6vQ74mSDKPAzv0bRy X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:MWHPR03MB2749; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2749; 25:Wpo721kEWDkRavLXIMNWb32lNMw6KNP9iD51ifAOv+qh18G2S2albAEvc6ve9vEagFxbZ42C6eIyPwTZhL7QEfYslujn/RLInwkG0rLZplW7xgt0JUcb64HKCQsg5zn+M7ntyuLRKVX4fOwhHSS52wMkbdqiXfcw4ChtEdzTkcQoOgQOuAPh0IskP5gROqEqzi9U30Z1SJuiunGS6iR4zNF0LVxmQroAmlW1TapB0ViIreVgE+pWeQzZ05fNR4G35qZKyv0fpkt5TLserTidpE8cQBCAtoeCfk0zLrkdo32EyBkcAZqzNo2rAeKhoEEr9ThftXt84T+I00NyW70qc0sQEYJTxzw38WHhdRYQJKhGAKGOjGIgxcGh3uKZ5faGP4xrZFhg5HolxrSuejH1xobrqPZqg/xLZsdNTinBaY2hH1X5RTrUGQ5EPYcXwF5X5oC2OAOV9JB4bpeo0CCCFw==; 31:KkXzgG+Y2KGCffUuSlu3bpOONgdZ8ObzIliKzA1HojygZybkQvGzsg9PVSr9usHfj6OaRbAUBXCanxONo1ZHm6q//LTcGJ+1nEclj9uiPZbxs689trTSmD4VnPI1D1B+44hu7unxH2ot6Zxz4aG8VeUCwDequMGZi3GFg1RfwZ2TsuvsvjURea2T5LFzWn4nPP7LfwCSS1AgCMzWEPAyXse4V7oJWs6XSKzXyXWCvxw6HgT0WV7xs9o1UDvVSt8uZmUIBJ6FFRK5ZVIsNNtUbOqek+tvBO9nVJmg4R3uX1A= X-Microsoft-Antispam-PRVS: <MWHPR03MB2749EAE93A8D08C6216A622798B90@MWHPR03MB2749.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13017025)(13024025)(13023025)(8121501046)(13018025)(13015025)(5005006)(10201501046)(3002001)(6055026); SRVR:MWHPR03MB2749; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2749; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2749; 4:Q8obmtPrVNDRK+uETy84Glhz/PP3/MitXI/LAFlLVyEZCxlbszRko2dCHxGnKMJIlRV5c8Rnr7avBrgbox8RrjUvCEUUM+pPmG3HxoGhCUAvqdDONWzMZayHOm3XpwsjDXFyNym7ZElr4/BU6NTd8OGvMWlOZAqOOW9SfG3/VikJ6fshF8v6BG3ed183otJMa8e8SlRXTDKBdy1dWQSvYIKkvEOWnncvHoA6xfhBgCqF4uQS6OrpfQqqsAkJphBbIgvwZqZ/o56RIRj9JfrmRaoH/eqK0sDLfYW7KN30bLuRHlccFj3iYLH4/qqBSSXsNWUf+pE0NdLEaY2C3vRoG0vaqtLwCEKIzl9hKpBhyyde5YcBy2e34fWuy5tICtRtBNgEq+E2UyZzFxff+o5PlV9PChJTI0adoltK4VFdADvlgwgJ7FDKPV1mbx2E5z8ipaWDUNDNzPNPwnM114o7ED984dGjpihenGO/jn/UHGwg9sOT+4DZFVWvR+2jGvp7yHZteBGBHZ/CILjj8OfleBuuZNYJdgVwtSVud4WX6LLZOUgLnfrg6I0NuCRCxbct X-Forefront-PRVS: 0121F24F22 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjAzTUIyNzQ5OzIzOlp3OG9zUlMxby9CL1VkSW5yd0daU1NORHpl?= =?utf-8?B?bkNpVkdsOENjVTd3SzhYUFpIdlIzNGpFYkdnbE4xS0RDS0V0ekI0M0NPaDlB?= =?utf-8?B?WEtJYkpLcFNzOVFlbGpSTHNNbHEzY3VyOG55UFNiZGlydG9DU2JCeEJyUDBo?= =?utf-8?B?OEQxeVpvL2tvOTAyeUhyYU1sdFowVGl3cG5sNmNjcDM2eTJMT2FYMzRFQlZl?= =?utf-8?B?cFlkL1ZEN00yOERPK3lqVXVNRkViSVBqbW10ak5EZ1o5Vm1qTjlCSlFTK2pi?= =?utf-8?B?Qy9ZNXA5TzJaMHFsY1IwZm81OGtwblZMYlErQ2FSSFp2R2t0ZU9IbnBsV1k4?= =?utf-8?B?OTdnQndsU2NsUnZSaXgxYzFkZmZLZ2JLUjdCZ2V4V2xYRjJ5NE5mb2x5cnA4?= =?utf-8?B?eXVQUjNWalU1by93Nld3NWRlaThtVEhpaW1XWm9aYmd6Z2lZWnByNm1EUjJh?= =?utf-8?B?KzBSMGoxczh0TC96aDQ3Z2VIZ2xCU3BYUW4vV3NnbktleEtGK1dmeXF3VFF5?= =?utf-8?B?V3JxRzV2ZkxFZ1B5Z1J4UTlKMjlQdndDZnZDeFFyMTZ3Q1pPUmQ3N1hmLzI5?= =?utf-8?B?dEhLcHI4eDNzREhPM1JWSUFHdE1UUGs1TWdpeXZyRUR5a2N6Z1NwaVZMbDFQ?= =?utf-8?B?TUV1QzNaMElrNVg2ZVY3M3pDVXIwZVYxSVk3MXNma09kOXp1M0R4V09CZmJ3?= =?utf-8?B?YWhOYS9uZ2ZsWE5CeVRVb293aVRvS2hsOHVYczhjZ0FEVXh0YllmTC9ldGxQ?= =?utf-8?B?TUprWmRYUHZraFM1dUdjK2hVNC9FQUVBcHFITWpCc21wRWU5Z1ROcElWZmVD?= =?utf-8?B?eUJwYUw1Vm5vREhLWk43N1BycXl3a1lHU0k2OHhIYlV3bVdnUUlnU2o3ZVBU?= =?utf-8?B?OHB4ZGU1UEpvbUJ1Rm0zT01Cd3hZK3E0UHVoWnMybzdWbUJMUUhzRVVnQmVy?= =?utf-8?B?a2poM0NNRER4ZXJYRDdTdkhPcUx5MHlCTmZLdE9GUi9nREZVRGFNWG1ORHF0?= =?utf-8?B?REFYZFlNOXRHM1pndThKSWljS3k1QzZUNzlUakVqSjJ1QmlxYVVtS3Jub0RC?= =?utf-8?B?WUxvd1huUVFLemxJQzFVK0pIVlBhazFwaEhMNlBDQ1laUnUxaHg3ZUc5QjAz?= =?utf-8?B?M1prMngzNm9vOFNmWmZUckhtSnJKaldEUzhDNGdqdDVxdm1QbnRiZldFL3NH?= =?utf-8?B?TVpoRExrQzdMNmFPWFBpRkEzaEdDZ1N2KzBIZEx1dG12bVpsdTErUkQvUHpo?= =?utf-8?B?eGFwK2hpM1I5TmhGZDhvb3hNbWRLc09YNDdmMjhIU3VNT0phNzloMXgvc1p5?= =?utf-8?B?MmtZc1BpQjNEWlRYblRGRkMyVkt2R0NBeU9oR0pQYUlwV0hCci8zdEppanY4?= =?utf-8?B?bkRWMW1iUkY5UWRpL2pFTjhJOE1GTGZzdDVqVjZhQmIzcUxFRGdBZHNHNlpC?= =?utf-8?B?Z0xpcDRxeC9MUjJueWFmOGM1Q0Vrbkp4Y1NnM3h3VVlTN3NpdUg5SFdqTWFq?= =?utf-8?Q?f7rPkZjOl8nGB7+sVqaQsCjzs=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2749; 6:9tm+g3t/4wHfRLE7Y7CFk/hna4iHnBHWmYb8T7LUZiFrUm8YFYvLduGd3uyS2GiVQ1plXUBH4Z1E13/DMSxhJOndc+NF5PLdhfKLqt7cX8fRTnJKZIG9QyMeq48ix4yLuVsNRM+REV2QEj0qYKokoN7nsxd61Jh7zlr8O4HmvYRS9fgYTrV3c0zEx7NUzueWeD0/mzB6gPscVIXuxc9tucVpfNyv3Kh7xVkeSPTlzThSftNRxfmrNyIfetXlCutjpu+pTRJ4jRD9hpbONwLnpKA4IVIX25JOPXlWZYR7iqoJ33Mj590Ps3svJOoG0rW/; 5:52rKibDKL+FAA9aaK5COfsCRB4RvVnqkqFrNHDN8RK/8cxXBz2RUgQ9DxXXJDJ1sLYV2V1BFfE/E/0Fbx6+lwWs61Ug/2dbsfotkZEAXqfWnp2ZqC0NK7VbDjsxiS/pJyDM0IiESNigqx8H7XbQYABi8hsEr+8v/rN3SeqdJy1zg+zapt8ntIRYRExpPcgB8; 24:eyWfTBNxzaLEh68s82PqZ7fRw9Qb2eC1nTzilNmPpXGPvXEUlcqqfJPZBpawsuLnkZgJVL3v8JzFaFmSTn0CqViwFNztr0ldspfrBifAyXI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2749; 7:Q/2+PfFR1ePj6YI/mnZiQWehuRL5aEjjRVdszf/F06NmchJMLQPcgetP4i16eYmy1lz6rGr1PEPpFKiiA9YSdyHnHKhn0BNwqHMNZLiSkqYEpoTlmKDlNtMbF6f3Nb2XHkp9vS6MgdIigZu6WJ4SMkb+Dfcr9wRftqdyGGg2A/QBoAIvnbFEqFvgGl8MkIFXMmp9tlPRAYAGUt5cLpHRDbG3hY64GoXHUhTtc3H/UsqX0cCSvEFc9rwB1ZLC4BA0IKtatzh4HyQ6Cv9EUS4Nl46gJSP0ueXMZjAqSF4rQ0mgpecAEfNILhPWOoXa/R8epBky05mOkQCbPpSTejNB6a98w4fqU5/w7BL+hy3AagE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2016 08:47:47.2727 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2749 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: <linux-crypto.vger.kernel.org> X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 5317d8cad44d..bc433edd34c4 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -2346,10 +2346,8 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, /* Check if data are contiguous. */ all_contig = !src_nents; - if (!all_contig) { - src_nents = src_nents ? : 1; + if (!all_contig) sec4_sg_len = src_nents; - } sec4_sg_len += dst_nents; diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index bb1c118b2d1b..38bb2411afcf 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -348,7 +348,7 @@ static int __init caam_rng_init(void) pr_err("Job Ring Device allocation for transform failed\n"); return PTR_ERR(dev); } - rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA); + rng_ctx = kmalloc(sizeof(*rng_ctx), GFP_DMA | GFP_KERNEL); if (!rng_ctx) { err = -ENOMEM; goto free_caam_alloc;
Fix the following smatch warnings: drivers/crypto/caam/caamalg.c:2350 aead_edesc_alloc() warn: we tested 'src_nents' before and it was 'true' drivers/crypto/caam/caamrng.c:351 caam_rng_init() error: no modifiers for allocation. Signed-off-by: Horia Geantă <horia.geanta@nxp.com> --- drivers/crypto/caam/caamalg.c | 4 +--- drivers/crypto/caam/caamrng.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)