public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Hansen <dave@sr71.net>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Dave Hansen <dave@sr71.net>,
	dave.hansen@linux.intel.com, bp@suse.de, hpa@zytor.com,
	fenghua.yu@intel.com, yu-cheng.yu@intel.com
Subject: [PATCH 3/5] x86: simplify early command line parsing
Date: Tue, 22 Dec 2015 14:52:41 -0800	[thread overview]
Message-ID: <20151222225241.15365E43@viggo.jf.intel.com> (raw)
In-Reply-To: <20151222225237.08CDE5F1@viggo.jf.intel.com>


From: Dave Hansen <dave.hansen@linux.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@linux.intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Cc: fenghua.yu@intel.com
Cc: yu-cheng.yu@intel.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'
_

  parent reply	other threads:[~2015-12-22 22:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-22 22:52 [PATCH 0/5] x86: early command-line parsing fixes / tests (v2) Dave Hansen
2015-12-22 22:52 ` [PATCH 1/5] x86: fix early command-line parsing when matching at end Dave Hansen
2016-01-05 18:35   ` Borislav Petkov
2016-01-05 18:51     ` Dave Hansen
2016-01-06 17:10   ` Borislav Petkov
2016-01-06 17:57   ` Dave Hansen
2016-01-06 18:14     ` Borislav Petkov
2016-02-03 11:34   ` [tip:x86/boot] x86/boot: Fix " tip-bot for Dave Hansen
2015-12-22 22:52 ` [PATCH 2/5] x86: fix early command-line parsing, when partial word match Dave Hansen
2016-02-03 11:35   ` [tip:x86/boot] x86/boot: Fix early command-line parsing when partial word matches tip-bot for Dave Hansen
2015-12-22 22:52 ` Dave Hansen [this message]
2016-01-06 17:10   ` [PATCH 3/5] x86: simplify early command line parsing Borislav Petkov
2016-01-06 17:35     ` Dave Hansen
2016-01-06 17:37     ` Dave Hansen
2016-01-06 17:48       ` Borislav Petkov
2016-02-03 11:35   ` [tip:x86/boot] x86/boot: Simplify " tip-bot for Dave Hansen
2015-12-22 22:52 ` [PATCH 4/5] x86: pass in size to early cmdline parsing Dave Hansen
2016-02-03 11:36   ` [tip:x86/boot] x86/boot: Pass " tip-bot for Dave Hansen
2015-12-22 22:52 ` [PATCH 5/5] x86: test early command-line code Dave Hansen
2016-01-27 12:28   ` Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151222225241.15365E43@viggo.jf.intel.com \
    --to=dave@sr71.net \
    --cc=bp@suse.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=fenghua.yu@intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    --cc=yu-cheng.yu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox