sysctl: use min() helper for namecmp()

Make it slightly readable by using min().

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 984e42f8cb112ab026560835517630fe843462c2..d25e8264099a65ce2f5a761c6765945fa21bde84 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -94,14 +94,9 @@ static void sysctl_print_dir(struct ctl_dir *dir)
 
 static int namecmp(const char *name1, int len1, const char *name2, int len2)
 {
-       int minlen;
        int cmp;
 
-       minlen = len1;
-       if (minlen > len2)
-               minlen = len2;
-
-       cmp = memcmp(name1, name2, minlen);
+       cmp = memcmp(name1, name2, min(len1, len2));
        if (cmp == 0)
                cmp = len1 - len2;
        return cmp;