diff options
Diffstat (limited to 'kernel/params.c')
| -rw-r--r-- | kernel/params.c | 21 | 
1 files changed, 16 insertions, 5 deletions
diff --git a/kernel/params.c b/kernel/params.c index cf448785d058..8e56f8b12d8f 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -12,6 +12,7 @@  #include <linux/err.h>  #include <linux/slab.h>  #include <linux/ctype.h> +#include <linux/security.h>  #ifdef CONFIG_SYSFS  /* Protects all built-in parameters, modules use their own param_lock */ @@ -96,13 +97,19 @@ bool parameq(const char *a, const char *b)  	return parameqn(a, b, strlen(a)+1);  } -static void param_check_unsafe(const struct kernel_param *kp) +static bool param_check_unsafe(const struct kernel_param *kp)  { +	if (kp->flags & KERNEL_PARAM_FL_HWPARAM && +	    security_locked_down(LOCKDOWN_MODULE_PARAMETERS)) +		return false; +  	if (kp->flags & KERNEL_PARAM_FL_UNSAFE) {  		pr_notice("Setting dangerous option %s - tainting kernel\n",  			  kp->name);  		add_taint(TAINT_USER, LOCKDEP_STILL_OK);  	} + +	return true;  }  static int parse_one(char *param, @@ -132,8 +139,10 @@ static int parse_one(char *param,  			pr_debug("handling %s with %p\n", param,  				params[i].ops->set);  			kernel_param_lock(params[i].mod); -			param_check_unsafe(¶ms[i]); -			err = params[i].ops->set(val, ¶ms[i]); +			if (param_check_unsafe(¶ms[i])) +				err = params[i].ops->set(val, ¶ms[i]); +			else +				err = -EPERM;  			kernel_param_unlock(params[i].mod);  			return err;  		} @@ -553,8 +562,10 @@ static ssize_t param_attr_store(struct module_attribute *mattr,  		return -EPERM;  	kernel_param_lock(mk->mod); -	param_check_unsafe(attribute->param); -	err = attribute->param->ops->set(buf, attribute->param); +	if (param_check_unsafe(attribute->param)) +		err = attribute->param->ops->set(buf, attribute->param); +	else +		err = -EPERM;  	kernel_param_unlock(mk->mod);  	if (!err)  		return len;  |