Commit fd205fa2 authored by Mika Kukkonen's avatar Mika Kukkonen Committed by Greg Kroah-Hartman

[PATCH] Upgrade security/root_plug.c to new module parameter syntax

Hi again,

Still doing my compile, and got this:

 CC [M]  security/root_plug.o
security/root_plug.c:39: warning: missing initializer
security/root_plug.c:39: warning: (near initialization for `__parm_vendor_id.addr')
security/root_plug.c:42: warning: missing initializer
security/root_plug.c:42: warning: (near initialization for `__parm_product_id.addr')
security/root_plug.c:48: warning: missing initializer
security/root_plug.c:48: warning: (near initialization for `__parm_debug.addr')

Simply upgrading root_plug to use the new module parameter syntax seemed to do
the trick. I made the debug writable, the others just readable to root.
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent b6c1cfc6
...@@ -36,16 +36,16 @@ static int secondary; ...@@ -36,16 +36,16 @@ static int secondary;
static int vendor_id = 0x0557; static int vendor_id = 0x0557;
static int product_id = 0x2008; static int product_id = 0x2008;
MODULE_PARM(vendor_id, "h"); module_param(vendor_id, uint, 0400);
MODULE_PARM_DESC(vendor_id, "USB Vendor ID of device to look for"); MODULE_PARM_DESC(vendor_id, "USB Vendor ID of device to look for");
MODULE_PARM(product_id, "h"); module_param(product_id, uint, 0400);
MODULE_PARM_DESC(product_id, "USB Product ID of device to look for"); MODULE_PARM_DESC(product_id, "USB Product ID of device to look for");
/* should we print out debug messages */ /* should we print out debug messages */
static int debug = 0; static int debug = 0;
MODULE_PARM(debug, "i"); module_param(debug, bool, 0600);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");
#if defined(CONFIG_SECURITY_ROOTPLUG_MODULE) #if defined(CONFIG_SECURITY_ROOTPLUG_MODULE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment