From: André Goddard Rosa <andre.goddard@gmail.com>
Date: Tue, 15 Dec 2009 02:01:04 +0000 (-0800)
Subject: string: on strstrip(), first remove leading spaces before running over str
X-Git-Tag: firefly_0821_release~9833^2~3702
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84c95c9acf0;p=firefly-linux-kernel-4.4.55.git

string: on strstrip(), first remove leading spaces before running over str

... so that strlen() iterates over a smaller string comprising of the
remaining characters only.

Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/lib/string.c b/lib/string.c
index 3a912a4e9a63..765566a6a088 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -364,8 +364,8 @@ char *strstrip(char *s)
 	size_t size;
 	char *end;
 
+	s = skip_spaces(s);
 	size = strlen(s);
-
 	if (!size)
 		return s;
 
@@ -374,7 +374,7 @@ char *strstrip(char *s)
 		end--;
 	*(end + 1) = '\0';
 
-	return skip_spaces(s);
+	return s;
 }
 EXPORT_SYMBOL(strstrip);