Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161000AbbHGIAi (ORCPT ); Fri, 7 Aug 2015 04:00:38 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:23212 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755394AbbHGIAb (ORCPT ); Fri, 7 Aug 2015 04:00:31 -0400 X-AuditID: cbfec7f4-f79c56d0000012ee-59-55c4659eacf4 From: Andrzej Hajda To: Herbert Xu , "David S. Miller" Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 09/31] crypto: use kmemdup rather than duplicating its implementation Date: Fri, 07 Aug 2015 09:59:15 +0200 Message-id: <1438934377-4922-10-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438934377-4922-1-git-send-email-a.hajda@samsung.com> References: <1438934377-4922-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmluLIzCtJLcpLzFFi42I5/e/4Fd15qUdCDT4c57G4te4cq8XGGetZ Leacb2Gx6H4lY3H/3k8mi8u75rBZrD1yl92B3WPLyptMHtsOqHr0bVnF6PF5k1wASxSXTUpq TmZZapG+XQJXxqVFVQUHeCv2Nr5lb2B8ztXFyMkhIWAisWfqEjYIW0ziwr31QDYXh5DAUkaJ CS+Os0I4TUwSb579YgSpYhPQlPi7+SZYh4hAuMT9M3eZQWxmgTOMEufeJXcxcnAIA8Vf9QaB hFkEVCWav0xmB7F5BZwl9j3awQyxTE7i5LHJrCA2J1B8ZfdMMFtIwEniTd8F5gmMvAsYGVYx iqaWJhcUJ6XnGuoVJ+YWl+al6yXn525ihATRlx2Mi49ZHWIU4GBU4uFN+Hc4VIg1say4MvcQ owQHs5II70N9oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeubvehwgJpCeWpGanphakFsFkmTg4 pRoYvZiv6SyoWut9f+fqiSv3TV1y5vPfhxctW2uMvLm/35CfGOKr3G117plsHccaX3XBU9N5 DL4l9Fw5zlLwY8dxiWvyq5gvf8vJVvSOfLSx7teaqgcCn2UCNv38y/zuxgwvSdkNIhHpHraO VnUfT9rMe1/6LNrYUMq6TG3P8dXrq/I3cB1etNtltRJLcUaioRZzUXEiANmHRmIeAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1919 Lines: 59 The patch was generated using fixed coccinelle semantic patch scripts/coccinelle/api/memdup.cocci [1]. [1]: http://permalink.gmane.org/gmane.linux.kernel/2014320 Signed-off-by: Andrzej Hajda --- crypto/echainiv.c | 7 ++----- crypto/seqiv.c | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/crypto/echainiv.c b/crypto/echainiv.c index d3896c7..d8968c0 100644 --- a/crypto/echainiv.c +++ b/crypto/echainiv.c @@ -134,13 +134,10 @@ static int echainiv_encrypt(struct aead_request *req) if (unlikely(!IS_ALIGNED((unsigned long)info, crypto_aead_alignmask(geniv) + 1))) { - info = kmalloc(ivsize, req->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL: - GFP_ATOMIC); + info = kmemdup(req->iv, ivsize, + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC); if (!info) return -ENOMEM; - - memcpy(info, req->iv, ivsize); } aead_request_set_callback(subreq, req->base.flags, compl, data); diff --git a/crypto/seqiv.c b/crypto/seqiv.c index 45d0563..eb83236 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c @@ -362,13 +362,11 @@ static int seqiv_aead_encrypt(struct aead_request *req) if (unlikely(!IS_ALIGNED((unsigned long)info, crypto_aead_alignmask(geniv) + 1))) { - info = kmalloc(ivsize, req->base.flags & - CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL: - GFP_ATOMIC); + info = kmemdup(req->iv, ivsize, + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC); if (!info) return -ENOMEM; - memcpy(info, req->iv, ivsize); compl = seqiv_aead_encrypt_complete; data = req; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/