From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411AbbHVN6w (ORCPT ); Sat, 22 Aug 2015 09:58:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35513 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751945AbbHVN6u (ORCPT ); Sat, 22 Aug 2015 09:58:50 -0400 Date: Sat, 22 Aug 2015 06:58:15 -0700 From: tip-bot for Andrzej Hajda Message-ID: Cc: m.szyprowski@samsung.com, mingo@kernel.org, b.zolnierkie@samsung.com, tglx@linutronix.de, bp@suse.de, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, a.hajda@samsung.com, peterz@infradead.org Reply-To: tglx@linutronix.de, bp@suse.de, hpa@zytor.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, a.hajda@samsung.com, linux-kernel@vger.kernel.org In-Reply-To: <1439201994-28067-2-git-send-email-bp@alien8.de> References: <1439201994-28067-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Use kmemdup() rather than duplicating its implementation Git-Commit-ID: d4e963644768b33aa3db7f470c35d74ed78d8354 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d4e963644768b33aa3db7f470c35d74ed78d8354 Gitweb: http://git.kernel.org/tip/d4e963644768b33aa3db7f470c35d74ed78d8354 Author: Andrzej Hajda AuthorDate: Mon, 10 Aug 2015 12:19:52 +0200 Committer: Ingo Molnar CommitDate: Sat, 22 Aug 2015 14:49:35 +0200 x86/microcode: Use kmemdup() rather than duplicating its implementation The patch was generated using fixed coccinelle semantic patch scripts/coccinelle/api/memdup.cocci. Signed-off-by: Andrzej Hajda Signed-off-by: Borislav Petkov Cc: Bartlomiej Zolnierkiewicz Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Marek Szyprowski Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1439201994-28067-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- 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 c7d2415..be37f10 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 8187b72..101f0ac 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); } /*