From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933375AbbHJKUC (ORCPT ); Mon, 10 Aug 2015 06:20:02 -0400 Received: from mail.skyhub.de ([78.46.96.112]:54326 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934465AbbHJKTw (ORCPT ); Mon, 10 Aug 2015 06:19:52 -0400 From: Borislav Petkov To: Ingo Molnar Cc: LKML Subject: [PATCH 1/3] x86/microcode: Use kmemdup() rather than duplicating its implementation Date: Mon, 10 Aug 2015 12:19:52 +0200 Message-Id: <1439201994-28067-2-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.5.0.rc2.28.g6003e7f In-Reply-To: <1439201994-28067-1-git-send-email-bp@alien8.de> References: <1439201994-28067-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrzej Hajda The patch was generated using fixed coccinelle semantic patch scripts/coccinelle/api/memdup.cocci. Signed-off-by: Andrzej Hajda Cc: Andrzej Hajda Cc: Bartlomiej Zolnierkiewicz Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Marek Szyprowski Cc: Thomas Gleixner Cc: x86-ml Link: http://lkml.kernel.org/r/1438934377-4922-8-git-send-email-a.hajda@samsung.com Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/microcode/amd.c | 4 +--- arch/x86/kernel/cpu/microcode/intel_early.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index c7d2415b8a24..be37f101ce5a 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -366,15 +366,13 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover) return -EINVAL; } - patch->data = kzalloc(patch_size, GFP_KERNEL); + patch->data = kmemdup(fw + SECTION_HDR_SIZE, patch_size, GFP_KERNEL); if (!patch->data) { pr_err("Patch data allocation failure.\n"); kfree(patch); return -EINVAL; } - /* All looks ok, copy patch... */ - memcpy(patch->data, fw + SECTION_HDR_SIZE, patch_size); INIT_LIST_HEAD(&patch->plist); patch->patch_id = mc_hdr->patch_id; patch->equiv_cpu = proc_id; diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c index 8187b7247d1c..101f0ac5f6e1 100644 --- a/arch/x86/kernel/cpu/microcode/intel_early.c +++ b/arch/x86/kernel/cpu/microcode/intel_early.c @@ -207,13 +207,11 @@ save_microcode(struct mc_saved_data *mc_saved_data, mc_hdr = &mc->hdr; size = get_totalsize(mc_hdr); - saved_ptr[i] = kmalloc(size, GFP_KERNEL); + saved_ptr[i] = kmemdup(mc, size, GFP_KERNEL); if (!saved_ptr[i]) { ret = -ENOMEM; goto err; } - - memcpy(saved_ptr[i], mc, size); } /* -- 2.5.0.rc2.28.g6003e7f