From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757914AbcBIQK7 (ORCPT ); Tue, 9 Feb 2016 11:10:59 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38484 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757881AbcBIQKV (ORCPT ); Tue, 9 Feb 2016 11:10:21 -0500 Date: Tue, 9 Feb 2016 08:09:34 -0800 From: tip-bot for Alexander Kuleshov Message-ID: Cc: andriy.shevchenko@linux.intel.com, hpa@zytor.com, mingo@kernel.org, alpopov@ptsecurity.com, luto@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, ryabinin.a.a@gmail.com, kuleshovmail@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: hpa@zytor.com, andriy.shevchenko@linux.intel.com, mingo@kernel.org, alpopov@ptsecurity.com, linux-kernel@vger.kernel.org, luto@kernel.org, peterz@infradead.org, ryabinin.a.a@gmail.com, kuleshovmail@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1455025494-4063-1-git-send-email-kuleshovmail@gmail.com> References: <1455025494-4063-1-git-send-email-kuleshovmail@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot: Use proper array element type in memset( ) size calculation Git-Commit-ID: a91bbe017552b80e12d712c85549b933a62c6ed4 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: a91bbe017552b80e12d712c85549b933a62c6ed4 Gitweb: http://git.kernel.org/tip/a91bbe017552b80e12d712c85549b933a62c6ed4 Author: Alexander Kuleshov AuthorDate: Tue, 9 Feb 2016 19:44:54 +0600 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 14:55:48 +0100 x86/boot: Use proper array element type in memset() size calculation I changed open coded zeroing loops to explicit memset()s in the following commit: 5e9ebbd87a99 ("x86/boot: Micro-optimize reset_early_page_tables()") The base for the size argument of memset was sizeof(pud_p/pmd_p), which are pointers - but the initialized array has pud_t/pmd_t elements. Luckily the two types had the same size, so this did not result in any runtime misbehavior. Signed-off-by: Alexander Kuleshov Cc: Alexander Popov Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Andy Shevchenko Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1455025494-4063-1-git-send-email-kuleshovmail@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/head64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 35843ca..7793a17 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -75,7 +75,7 @@ again: } pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++]; - memset(pud_p, 0, sizeof(pud_p) * PTRS_PER_PUD); + memset(pud_p, 0, sizeof(*pud_p) * PTRS_PER_PUD); *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE; } pud_p += pud_index(address); @@ -90,7 +90,7 @@ again: } pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++]; - memset(pmd_p, 0, sizeof(pmd_p) * PTRS_PER_PMD); + memset(pmd_p, 0, sizeof(*pmd_p) * PTRS_PER_PMD); *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE; } pmd = (physaddr & PMD_MASK) + early_pmd_flags;