Messages in this thread | | | Date | Mon, 22 Sep 2008 15:57:33 -0700 | From | Chris Wright <> | Subject | Re: [PATCH 1/2] file capabilities: add no_file_caps switch (v2) |
| |
* Serge E. Hallyn (serue@us.ibm.com) wrote: > --- a/kernel/capability.c > +++ b/kernel/capability.c > @@ -33,6 +33,19 @@ EXPORT_SYMBOL(__cap_empty_set); > EXPORT_SYMBOL(__cap_full_set); > EXPORT_SYMBOL(__cap_init_eff_set); > > +#ifdef CONFIG_SECURITY_FILE_CAPABILITIES > +int file_caps_enabled = 1; > + > +static int __init file_caps_disable(char *str) > +{ > + file_caps_enabled = 0; > + return 1; > +} > +__setup("no_file_caps", file_caps_disable); > +#else > +static const int file_caps_enabled = 0; > +#endif
> --- a/security/commoncap.c > +++ b/security/commoncap.c > @@ -27,6 +27,12 @@ > #include <linux/prctl.h> > #include <linux/securebits.h> > > +#ifdef CONFIG_SECURITY_FILE_CAPABILITIES > +extern int file_caps_enabled; > +#else > +static const int file_caps_enabled = 0; > +#endif > +
file_caps_enabled cut 'n paste mistake when !CONFIG_SECURITY_FILE_CAPABILITIES?
Also, plan to update Documentation/kernel-parameters.txt?
thanks, -chris
| |