From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756990AbcBCLhI (ORCPT ); Wed, 3 Feb 2016 06:37:08 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55812 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756947AbcBCLhD (ORCPT ); Wed, 3 Feb 2016 06:37:03 -0500 Date: Wed, 3 Feb 2016 03:36:02 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: luto@amacapital.net, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, dvlasenk@redhat.com, dave.hansen@linux.intel.com, torvalds@linux-foundation.org, bp@suse.de, brgerst@gmail.com, mingo@kernel.org, bp@alien8.de Reply-To: bp@alien8.de, mingo@kernel.org, bp@suse.de, brgerst@gmail.com, dvlasenk@redhat.com, dave.hansen@linux.intel.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, peterz@infradead.org, luto@amacapital.net, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <20151222225243.5CC47EB6@viggo.jf.intel.com> References: <20151222225243.5CC47EB6@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot: Pass in size to early cmdline parsing Git-Commit-ID: 8c0517759a1a100a8b83134cf3c7f254774aaeba 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: 8c0517759a1a100a8b83134cf3c7f254774aaeba Gitweb: http://git.kernel.org/tip/8c0517759a1a100a8b83134cf3c7f254774aaeba Author: Dave Hansen AuthorDate: Tue, 22 Dec 2015 14:52:43 -0800 Committer: Ingo Molnar CommitDate: Wed, 3 Feb 2016 12:03:18 +0100 x86/boot: Pass in size to early cmdline parsing We will use this in a few patches to implement tests for early parsing. Signed-off-by: Dave Hansen [ Aligned args properly. ] Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: fenghua.yu@intel.com Cc: yu-cheng.yu@intel.com Link: http://lkml.kernel.org/r/20151222225243.5CC47EB6@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/lib/cmdline.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/lib/cmdline.c b/arch/x86/lib/cmdline.c index 945a639..5cc78bf 100644 --- a/arch/x86/lib/cmdline.c +++ b/arch/x86/lib/cmdline.c @@ -25,7 +25,9 @@ static inline int myisspace(u8 c) * as an entire word in @cmdline. For instance, if @option="car" * then a cmdline which contains "cart" will not match. */ -int cmdline_find_option_bool(const char *cmdline, const char *option) +static int +__cmdline_find_option_bool(const char *cmdline, int max_cmdline_size, + const char *option) { char c; int pos = 0, wstart = 0; @@ -43,7 +45,7 @@ int cmdline_find_option_bool(const char *cmdline, const char *option) * This 'pos' check ensures we do not overrun * a non-NULL-terminated 'cmdline' */ - while (pos < COMMAND_LINE_SIZE) { + while (pos < max_cmdline_size) { c = *(char *)cmdline++; pos++; @@ -101,3 +103,8 @@ int cmdline_find_option_bool(const char *cmdline, const char *option) return 0; /* Buffer overrun */ } + +int cmdline_find_option_bool(const char *cmdline, const char *option) +{ + return __cmdline_find_option_bool(cmdline, COMMAND_LINE_SIZE, option); +}