diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c25e67e19af7..067554bda8b7 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/sysctl.h> | 25 | #include <linux/sysctl.h> |
26 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
27 | #include <linux/capability.h> | 27 | #include <linux/security.h> |
28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
29 | #include <linux/utsname.h> | 29 | #include <linux/utsname.h> |
30 | #include <linux/smp_lock.h> | 30 | #include <linux/smp_lock.h> |
@@ -371,6 +371,7 @@ static struct ctl_table kern_table[] = { | |||
371 | .proc_handler = &proc_dointvec_taint, | 371 | .proc_handler = &proc_dointvec_taint, |
372 | }, | 372 | }, |
373 | #endif | 373 | #endif |
374 | #ifdef CONFIG_SECURITY_CAPABILITIES | ||
374 | { | 375 | { |
375 | .procname = "cap-bound", | 376 | .procname = "cap-bound", |
376 | .data = &cap_bset, | 377 | .data = &cap_bset, |
@@ -378,6 +379,7 @@ static struct ctl_table kern_table[] = { | |||
378 | .mode = 0600, | 379 | .mode = 0600, |
379 | .proc_handler = &proc_dointvec_bset, | 380 | .proc_handler = &proc_dointvec_bset, |
380 | }, | 381 | }, |
382 | #endif /* def CONFIG_SECURITY_CAPABILITIES */ | ||
381 | #ifdef CONFIG_BLK_DEV_INITRD | 383 | #ifdef CONFIG_BLK_DEV_INITRD |
382 | { | 384 | { |
383 | .ctl_name = KERN_REALROOTDEV, | 385 | .ctl_name = KERN_REALROOTDEV, |
@@ -1872,10 +1874,11 @@ static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp, | |||
1872 | return 0; | 1874 | return 0; |
1873 | } | 1875 | } |
1874 | 1876 | ||
1877 | #ifdef CONFIG_SECURITY_CAPABILITIES | ||
1875 | /* | 1878 | /* |
1876 | * init may raise the set. | 1879 | * init may raise the set. |
1877 | */ | 1880 | */ |
1878 | 1881 | ||
1879 | int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp, | 1882 | int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp, |
1880 | void __user *buffer, size_t *lenp, loff_t *ppos) | 1883 | void __user *buffer, size_t *lenp, loff_t *ppos) |
1881 | { | 1884 | { |
@@ -1889,6 +1892,7 @@ int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp, | |||
1889 | return do_proc_dointvec(table,write,filp,buffer,lenp,ppos, | 1892 | return do_proc_dointvec(table,write,filp,buffer,lenp,ppos, |
1890 | do_proc_dointvec_bset_conv,&op); | 1893 | do_proc_dointvec_bset_conv,&op); |
1891 | } | 1894 | } |
1895 | #endif /* def CONFIG_SECURITY_CAPABILITIES */ | ||
1892 | 1896 | ||
1893 | /* | 1897 | /* |
1894 | * Taint values can only be increased | 1898 | * Taint values can only be increased |