Commit 4251c2a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents c31c24b8 4982223e

Documentation/kernel-parameters.txt

+25 −15
Original line number Diff line number Diff line 
                          Kernel Parameters

                          ~~~~~~~~~~~~~~~~~



The following is a consolidated list of the kernel parameters as implemented

(mostly) by the __setup() macro and sorted into English Dictionary order

(defined as ignoring all punctuation and sorting digits before letters in a

case insensitive manner), and with descriptions where known.



Module parameters for loadable modules are specified only as the

parameter name with optional '=' and value as appropriate, such as:



	modprobe usbcore blinkenlights=1



Module parameters for modules that are built into the kernel image

are specified on the kernel command line with the module name plus

'.' plus parameter name, with '=' and value if appropriate, such as:



	usbcore.blinkenlights=1

The following is a consolidated list of the kernel parameters as

implemented by the __setup(), core_param() and module_param() macros

and sorted into English Dictionary order (defined as ignoring all

punctuation and sorting digits before letters in a case insensitive

manner), and with descriptions where known.



The kernel parses parameters from the kernel command line up to "--";

if it doesn't recognize a parameter and it doesn't contain a '.', the

parameter gets passed to init: parameters with '=' go into init's

environment, others are passed as command line arguments to init.

Everything after "--" is passed as an argument to init.



Module parameters can be specified in two ways: via the kernel command

line with a module name prefix, or via modprobe, e.g.:



	(kernel command line) usbcore.blinkenlights=1

	(modprobe command line) modprobe usbcore blinkenlights=1



Parameters for modules which are built into the kernel need to be

specified on the kernel command line.  modprobe looks through the

kernel command line (/proc/cmdline) and collects module parameters

when it loads a module, so the kernel command line can be used for

loadable modules too.



Hyphens (dashes) and underscores are equivalent in parameter names, so

	log_buf_len=1M print-fatal-signals=1

can also be entered as

	log-buf-len=1M print_fatal_signals=1



Double-quotes can be used to protect spaces in values, e.g.:

	param="spaces in here"



This document may not be entirely up to date and comprehensive. The command

"modinfo -p ${modulename}" shows a current list of all parameters of a loadable

drivers/hid/hid-lg4ff.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void hid_lg4ff_set_range_g25(struct hid_device *hid, u16 range); 
static ssize_t lg4ff_range_show(struct device *dev, struct device_attribute *attr, char *buf);

static ssize_t lg4ff_range_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);



static DEVICE_ATTR(range, S_IRWXU | S_IRWXG | S_IRWXO, lg4ff_range_show, lg4ff_range_store);

static DEVICE_ATTR(range, S_IRWXU | S_IRWXG | S_IROTH, lg4ff_range_show, lg4ff_range_store);



struct lg4ff_device_entry {

	__u32 product_id;

drivers/hid/hid-picolcd_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static ssize_t picolcd_fb_update_rate_store(struct device *dev, 
	return count;

}



static DEVICE_ATTR(fb_update_rate, 0666, picolcd_fb_update_rate_show,

static DEVICE_ATTR(fb_update_rate, 0664, picolcd_fb_update_rate_show,

		picolcd_fb_update_rate_store);



/* initialize Framebuffer device */

drivers/mtd/devices/docg3.c

+2 −2
Original line number Diff line number Diff line
@@ -1608,8 +1608,8 @@ static ssize_t dps1_insert_key(struct device *dev, 
#define FLOOR_SYSFS(id) { \

	__ATTR(f##id##_dps0_is_keylocked, S_IRUGO, dps0_is_key_locked, NULL), \

	__ATTR(f##id##_dps1_is_keylocked, S_IRUGO, dps1_is_key_locked, NULL), \

	__ATTR(f##id##_dps0_protection_key, S_IWUGO, NULL, dps0_insert_key), \

	__ATTR(f##id##_dps1_protection_key, S_IWUGO, NULL, dps1_insert_key), \

	__ATTR(f##id##_dps0_protection_key, S_IWUSR|S_IWGRP, NULL, dps0_insert_key), \

	__ATTR(f##id##_dps1_protection_key, S_IWUSR|S_IWGRP, NULL, dps1_insert_key), \

}



static struct device_attribute doc_sys_attrs[DOC_MAX_NBFLOORS][4] = {

drivers/regulator/virtual.c

+5 −5
Original line number Diff line number Diff line
@@ -266,11 +266,11 @@ static ssize_t set_mode(struct device *dev, struct device_attribute *attr, 
	return count;

}



static DEVICE_ATTR(min_microvolts, 0666, show_min_uV, set_min_uV);

static DEVICE_ATTR(max_microvolts, 0666, show_max_uV, set_max_uV);

static DEVICE_ATTR(min_microamps, 0666, show_min_uA, set_min_uA);

static DEVICE_ATTR(max_microamps, 0666, show_max_uA, set_max_uA);

static DEVICE_ATTR(mode, 0666, show_mode, set_mode);

static DEVICE_ATTR(min_microvolts, 0664, show_min_uV, set_min_uV);

static DEVICE_ATTR(max_microvolts, 0664, show_max_uV, set_max_uV);

static DEVICE_ATTR(min_microamps, 0664, show_min_uA, set_min_uA);

static DEVICE_ATTR(max_microamps, 0664, show_max_uA, set_max_uA);

static DEVICE_ATTR(mode, 0664, show_mode, set_mode);



static struct attribute *regulator_virtual_attributes[] = {

	&dev_attr_min_microvolts.attr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE