History

kernel/params.c: generalize bool_enable_only

This takes out the bool_enable_only implementation from the module loading code and generalizes it so that others can make use of it.

Luis R. Rodriguez committed 11 years ago

Commit d19f05d1 parent 05f408d3 files · +36 −31Browse files

Unified · Split

3 files
  1. include/linux/moduleparam.h +6 −0
  2. kernel/module.c +0 −31
  3. kernel/params.c +30 −0
include/linux/moduleparam.h+6−0
@@ -427,6 +427,12 @@ extern int param_set_bool(const char *val, const struct kernel_param *kp); · 426 unmodified lines
427extern int param_get_bool(char *buffer, const struct kernel_param *kp);427extern int param_get_bool(char *buffer, const struct kernel_param *kp);
428#define param_check_bool(name, p) __param_check(name, p, bool)428#define param_check_bool(name, p) __param_check(name, p, bool)
429 429
430extern const struct kernel_param_ops param_ops_bool_enable_only;
431extern int param_set_bool_enable_only(const char *val,
432 const struct kernel_param *kp);
433/* getter is the same as for the regular bool */
434#define param_check_bool_enable_only param_check_bool
435
430extern const struct kernel_param_ops param_ops_invbool;436extern const struct kernel_param_ops param_ops_invbool;
431extern int param_set_invbool(const char *val, const struct kernel_param *kp);437extern int param_set_invbool(const char *val, const struct kernel_param *kp);
432extern int param_get_invbool(char *buffer, const struct kernel_param *kp);438extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
kernel/module.c+0−31
@@ -298,37 +298,6 @@ static bool sig_enforce = true; · 297 unmodified lines
298#else298#else
299static bool sig_enforce = false;299static bool sig_enforce = false;
300 300
301static int param_set_bool_enable_only(const char *val,
302 const struct kernel_param *kp)
303{
304 int err = 0;
305 bool new_value;
306 bool orig_value = *(bool *)kp->arg;
307 struct kernel_param dummy_kp = *kp;
308
309 dummy_kp.arg = &new_value;
310
311 err = param_set_bool(val, &dummy_kp);
312 if (err)
313 return err;
314
315 /* Don't let them unset it once it's set! */
316 if (!new_value && orig_value)
317 return -EROFS;
318
319 if (new_value)
320 err = param_set_bool(val, kp);
321
322 return err;
323}
324
325static const struct kernel_param_ops param_ops_bool_enable_only = {
326 .flags = KERNEL_PARAM_OPS_FL_NOARG,
327 .set = param_set_bool_enable_only,
328 .get = param_get_bool,
329};
330#define param_check_bool_enable_only param_check_bool
331
332module_param(sig_enforce, bool_enable_only, 0644);301module_param(sig_enforce, bool_enable_only, 0644);
333#endif /* !CONFIG_MODULE_SIG_FORCE */302#endif /* !CONFIG_MODULE_SIG_FORCE */
334#endif /* CONFIG_MODULE_SIG */303#endif /* CONFIG_MODULE_SIG */
kernel/params.c+30−0
@@ -335,6 +335,36 @@ const struct kernel_param_ops param_ops_bool = { · 334 unmodified lines
335};335};
336EXPORT_SYMBOL(param_ops_bool);336EXPORT_SYMBOL(param_ops_bool);
337 337
338int param_set_bool_enable_only(const char *val, const struct kernel_param *kp)
339{
340 int err = 0;
341 bool new_value;
342 bool orig_value = *(bool *)kp->arg;
343 struct kernel_param dummy_kp = *kp;
344
345 dummy_kp.arg = &new_value;
346
347 err = param_set_bool(val, &dummy_kp);
348 if (err)
349 return err;
350
351 /* Don't let them unset it once it's set! */
352 if (!new_value && orig_value)
353 return -EROFS;
354
355 if (new_value)
356 err = param_set_bool(val, kp);
357
358 return err;
359}
360EXPORT_SYMBOL_GPL(param_set_bool_enable_only);
361
362const struct kernel_param_ops param_ops_bool_enable_only = {
363 .flags = KERNEL_PARAM_OPS_FL_NOARG,
364 .set = param_set_bool_enable_only,
365 .get = param_get_bool,
366};
367
338/* This one must be bool. */368/* This one must be bool. */
339int param_set_invbool(const char *val, const struct kernel_param *kp)369int param_set_invbool(const char *val, const struct kernel_param *kp)
340{370{