]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
panic: sys_info: deduplicate local variable 'table; assignments
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 30 Oct 2025 11:44:21 +0000 (12:44 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 20 Nov 2025 22:03:40 +0000 (14:03 -0800)
The both handlers use the local 'table' variable and assign the same data
to it, deduplicate that.

Link: https://lkml.kernel.org/r/20251030132007.3742368-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Feng Tang <feng.tang@linux.alibaba.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/sys_info.c

index eb5c1226bfc81f2356ee102107467cd89b7f8b27..94526de8482b761df901f71922aa650d96e05f20 100644 (file)
@@ -63,12 +63,13 @@ int sysctl_sys_info_handler(const struct ctl_table *ro_table, int write,
        if (!names)
                return -ENOMEM;
 
+       table = *ro_table;
+       table.data = names;
+       table.maxlen = maxlen;
+
        if (write) {
                int ret;
 
-               table = *ro_table;
-               table.data = names;
-               table.maxlen = maxlen;
                ret = proc_dostring(&table, write, buffer, lenp, ppos);
                if (ret)
                        return ret;
@@ -93,9 +94,6 @@ int sysctl_sys_info_handler(const struct ctl_table *ro_table, int write,
                        }
                }
 
-               table = *ro_table;
-               table.data = names;
-               table.maxlen = maxlen;
                return proc_dostring(&table, write, buffer, lenp, ppos);
        }
 }