Skip to contentSkip to conversation

lib-cmdline-fix-get_option-for-strings-starting-with-hyphen.patch removed from -mm tree

merged [email protected] 1 participant 1 message Dec 16, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: lib/cmdline: fix get_option() for strings starting with hyphen
has been removed from the -mm tree. Its filename was
lib-cmdline-fix-get_option-for-strings-starting-with-hyphen.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Andy Shevchenko <[email protected]>
Subject: lib/cmdline: fix get_option() for strings starting with hyphen

When string doesn't have an integer and starts from hyphen get_option() may return interesting results. Fix it to return 0.

The simple_strtoull() is used due to absence of simple_strtoul() in a boot code on some architectures.

Note, the Fixes tag below is rather for anthropological curiosity.

Fixes f68565831e72 ("Import 2.4.0-test2pre3")
Cc Brendan Higgins <[email protected]>
Cc David Gow <[email protected]>
Cc Mark Brown <[email protected]>
Cc Matti Vaittinen <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Vitor Massaru Iha <[email protected]>

---

 lib/cmdline.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
lib/cmdline.c renamed from lib/cmdline.c~lib-cmdline-fix-get_option-for-strings-starting-with-hyphen +7 -1
@@ -45,6 +45,9 @@ static int get_range(char **str, int *pi
  *	1 - int found, no subsequent comma
  *	2 - int found including a subsequent comma
  *	3 - hyphen found to denote a range
+ *
+ *	Leading hyphen without integer is no integer case, but we consume it
+ *	for the sake of simplification.
  */
 
 int get_option(char **str, int *pint)
@@ -53,7 +56,10 @@ int get_option(char **str, int *pint)
 
 	if (!cur || !(*cur))
 		return 0;
-	*pint = simple_strtol(cur, str, 0);
+	if (*cur == '-')
+		*pint = -simple_strtoull(++cur, str, 0);
+	else
+		*pint = simple_strtoull(cur, str, 0);
 	if (cur == *str)
 		return 0;
 	if (**str == ',') {

_

Patches currently in -mm which might be from [email protected] are