[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20151222225241.15365E43@viggo.jf.intel.com>
Date: Tue, 22 Dec 2015 14:52:41 -0800
From: Dave Hansen <dave@...1.net>
To: x86@...nel.org
Cc: linux-kernel@...r.kernel.org, Dave Hansen <dave@...1.net>,
dave.hansen@...ux.intel.com, bp@...e.de, hpa@...or.com,
fenghua.yu@...el.com, yu-cheng.yu@...el.com
Subject: [PATCH 3/5] x86: simplify early command line parsing
From: Dave Hansen <dave.hansen@...ux.intel.com>
__cmdline_find_option_bool() tries to account for both
NULL-terminated and non-NULL-terminated strings. It keeps 'pos'
to look for the end of the buffer and also looks for '!c' in a
bunch of places to look for NULL termination.
But, it also calls strlen(). You can't call strlen on a
non-NULL-terminated string.
If !strlen(cmdline), then cmdline[0]=='\0'. In that case, we
will go in to the while() loop, set c='\0', hit st_wordstart,
notice !c, and will immediately return 0.
So, remove the strlen(). It is unnecessary and unsafe.
Signed-off-by: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: linux-kernel@...r.kernel.org
Cc: fenghua.yu@...el.com
Cc: yu-cheng.yu@...el.com
---
b/arch/x86/lib/cmdline.c | 3 ---
1 file changed, 3 deletions(-)
diff -puN arch/x86/lib/cmdline.c~x86-early-command-line-non-term arch/x86/lib/cmdline.c
--- a/arch/x86/lib/cmdline.c~x86-early-command-line-non-term 2015-12-22 11:56:59.454186167 -0800
+++ b/arch/x86/lib/cmdline.c 2015-12-22 11:56:59.457186302 -0800
@@ -39,9 +39,6 @@ int cmdline_find_option_bool(const char
if (!cmdline)
return -1; /* No command line */
- if (!strlen(cmdline))
- return 0;
-
/*
* This 'pos' check ensures we do not overrun
* a non-NULL-terminated 'cmdline'
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists