1 files changed, 6 insertions, 6 deletions

diff --git a/lib/string.c b/lib/string.c
index 3206d0178296..cdd97f431ae2 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -313,12 +313,12 @@ EXPORT_SYMBOL(strchrnul);
  */
 char *strrchr(const char *s, int c)
 {
-       const char *p = s + strlen(s);
-       do {
-           if (*p == (char)c)
-               return (char *)p;
-       } while (--p >= s);
-       return NULL;
+        const char *last = NULL;
+        do {
+                if (*s == (char)c)
+                        last = s;
+        } while (*s++);
+        return (char *)last;
 }
 EXPORT_SYMBOL(strrchr);
 #endif