From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812AbbCBLyE (ORCPT ); Mon, 2 Mar 2015 06:54:04 -0500 Received: from mail-bl2on0115.outbound.protection.outlook.com ([65.55.169.115]:14800 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751610AbbCBLyA (ORCPT ); Mon, 2 Mar 2015 06:54:00 -0500 X-Greylist: delayed 2662 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Mar 2015 06:54:00 EST Message-ID: <54F44F4C.8050604@freescale.com> Date: Mon, 2 Mar 2015 13:53:48 +0200 From: =?UTF-8?B?SG9yaWEgR2VhbnTEgw==?= User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: , , CC: , , , , , , Subject: Re: [PATCH 3/4] crypto: caamhash: add two missed dma_mapping_error References: <1425103234-31129-1-git-send-email-yanjiang.jin@windriver.com> <1425103234-31129-3-git-send-email-yanjiang.jin@windriver.com> In-Reply-To: <1425103234-31129-3-git-send-email-yanjiang.jin@windriver.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=horia.geanta@freescale.com; windriver.com; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(339900001)(24454002)(479174004)(189002)(199003)(377454003)(51704005)(5820100001)(65956001)(47776003)(65806001)(62966003)(77156002)(104016003)(36756003)(46102003)(33656002)(86362001)(2201001)(92566002)(59896002)(2950100001)(77096005)(23676002)(106466001)(105606002)(50466002)(85182001)(120886001)(87936001)(83506001)(19580405001)(6806004)(19580395003)(87266999)(65816999)(76176999)(85426001)(54356999)(50986999);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR0301MB0720;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0720; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006);SRVR:DM2PR0301MB0720;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0720; X-Forefront-PRVS: 0503FF9A3E X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2015 11:53:57.1809 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0720 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/28/2015 8:00 AM, yanjiang.jin@windriver.com wrote: > From: Yanjiang Jin > > Add two missed dma_mapping_error() after dma_map_single(). > > Signed-off-by: Yanjiang Jin > --- > drivers/crypto/caam/caamhash.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c > index f347ab7..f6ad322 100644 > --- a/drivers/crypto/caam/caamhash.c > +++ b/drivers/crypto/caam/caamhash.c > @@ -160,6 +160,10 @@ static inline dma_addr_t map_seq_out_ptr_result(u32 *desc, struct device *jrdev, > dma_addr_t dst_dma; > > dst_dma = dma_map_single(jrdev, result, digestsize, DMA_FROM_DEVICE); > + if (dma_mapping_error(jrdev, dst_dma)) { > + dev_err(jrdev, "unable to map dst dma\n"); > + return -ENOMEM; > + } > append_seq_out_ptr(desc, dst_dma, digestsize, 0); > > return dst_dma; Value returned by map_seq_out_ptr_result() - dst_dma - is always fed to dma_mapping_error(). Note that using an invalid dst_dma in append_seq_out_ptr() doesn't break anything, so it's ok to check dst_dma later. > @@ -173,6 +177,10 @@ static inline dma_addr_t buf_map_to_sec4_sg(struct device *jrdev, > dma_addr_t buf_dma; > > buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE); > + if (dma_mapping_error(jrdev, buf_dma)) { > + dev_err(jrdev, "unable to map buf dma\n"); > + return 0; > + } > dma_to_sec4_sg_one(sec4_sg, buf_dma, buflen, 0); > > return buf_dma; > These functions are expected to return dma_addr_t, not an error code. If dma_mapping_error() is needed within their scope, the return type will have to change. And return value will need to be checked by their callers.