Greg Kroah-Hartman 8a4561e60b ANDROID: fix up sysctl_vals change in 5.15.58 ...

In commit 78e36f3b0dae ("sysctl: move some boundary constants from
sysctl.c to sysctl_vals"), the sysctl_vals[] array changed size and
contents, which does not work well when external modules are accessing
it and relying on it to have the same contents.

Fix this up by putting back the original values and size and creating a
new array, sysctl_vals_new, that is used by the #define values in
include/linux/sysctl.h.  If any existing module that used sysctl_vals is
rebuilt, it will then require sysctl_vals_new to be exported (as it
pickes it up from the #define), so add the symbol to the exported symbol
list to ensure that existing code all still builds and works properly.

Functions changes summary: 0 Removed, 0 Changed (53 filtered out), 0 Added functions
Variables changes summary: 0 Removed, 0 Changed (1 filtered out), 1 Added variables

1 Added variable:

  [A] 'const int sysctl_vals_new[10]'

Bug: 161946584
Fixes: 78e36f3b0dae ("sysctl: move some boundary constants from sysctl.c to sysctl_vals")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie543b101d5e3e4c91984d9f5fe52de0945fa0681

2022-08-15 12:31:51 +02:00

8.2 KiB

Raw Blame History

View Raw