Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull module updates from Rusty Russell:
 "Most of this is cleaning up various driver sysfs permissions so we can
  re-add the perm check (we unified the module param and sysfs checks,
  but the module ones were stronger so we weakened them temporarily).

  Param parsing gets documented, and also "--" now forces args to be
  handed to init (and ignored by the kernel).

  Module NX/RO protections get tightened: we now set them before calling
  parse_args()"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: set nx before marking module MODULE_STATE_COMING.
  samples/kobject/: avoid world-writable sysfs files.
  drivers/hid/hid-picolcd_fb: avoid world-writable sysfs files.
  drivers/staging/speakup/: avoid world-writable sysfs files.
  drivers/regulator/virtual: avoid world-writable sysfs files.
  drivers/scsi/pm8001/pm8001_ctl.c: avoid world-writable sysfs files.
  drivers/hid/hid-lg4ff.c: avoid world-writable sysfs files.
  drivers/video/fbdev/sm501fb.c: avoid world-writable sysfs files.
  drivers/mtd/devices/docg3.c: avoid world-writable sysfs files.
  speakup: fix incorrect perms on speakup_acntsa.c
  cpumask.h: silence warning with -Wsign-compare
  Documentation: Update kernel-parameters.tx
  param: hand arguments after -- straight to init
  modpost: Fix resource leak in read_dump()

1 files changed, 29 insertions, 4 deletions

diff --git a/init/main.c b/init/main.c
index 0ec25157deef..e8ae1fef0908 100644
--- a/init/main.c
+++ b/init/main.c
@@ -253,6 +253,27 @@ static int __init repair_env_string(char *param, char *val, const char *unused)
         return 0;
 }
 
+/* Anything after -- gets handed straight to init. */
+static int __init set_init_arg(char *param, char *val, const char *unused)
+{
+        unsigned int i;
+
+        if (panic_later)
+                return 0;
+
+        repair_env_string(param, val, unused);
+
+        for (i = 0; argv_init[i]; i++) {
+                if (i == MAX_INIT_ARGS) {
+                        panic_later = "init";
+                        panic_param = param;
+                        return 0;
+                }
+        }
+        argv_init[i] = param;
+        return 0;
+}
+
 /*
  * Unknown boot options get handed to init, unless they look like
  * unused parameters (modprobe will find them in /proc/cmdline).
@@ -479,7 +500,7 @@ static void __init mm_init(void)
 
 asmlinkage __visible void __init start_kernel(void)
 {
-        char * command_line;
+        char * command_line, *after_dashes;
         extern const struct kernel_param __start___param[], __stop___param[];
 
         /*
@@ -519,9 +540,13 @@ asmlinkage __visible void __init start_kernel(void)
 
         pr_notice("Kernel command line: %s\n", boot_command_line);
         parse_early_param();
-        parse_args("Booting kernel", static_command_line, __start___param,
-                   __stop___param - __start___param,
-                   -1, -1, &unknown_bootoption);
+        after_dashes = parse_args("Booting kernel",
+                                  static_command_line, __start___param,
+                                  __stop___param - __start___param,
+                                  -1, -1, &unknown_bootoption);
+        if (after_dashes)
+                parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
+                           set_init_arg);
 
         jump_label_init();