From: Eric W. Biederman Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton --- include/linux/sysctl.h | 2 ++ kernel/sysctl.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff -puN include/linux/sysctl.h~sysctl-allow-sysctl_perm-to-be-called-from-outside-of-sysctlc include/linux/sysctl.h --- a/include/linux/sysctl.h~sysctl-allow-sysctl_perm-to-be-called-from-outside-of-sysctlc +++ a/include/linux/sysctl.h @@ -924,8 +924,10 @@ enum #include /* For the /proc/sys support */ +struct ctl_table; extern struct ctl_table_header *sysctl_head_next(struct ctl_table_header *prev); extern void sysctl_head_finish(struct ctl_table_header *prev); +extern int sysctl_perm(struct ctl_table *table, int op); extern void sysctl_init(void); diff -puN kernel/sysctl.c~sysctl-allow-sysctl_perm-to-be-called-from-outside-of-sysctlc kernel/sysctl.c --- a/kernel/sysctl.c~sysctl-allow-sysctl_perm-to-be-called-from-outside-of-sysctlc +++ a/kernel/sysctl.c @@ -1195,7 +1195,7 @@ asmlinkage long sys_sysctl(struct __sysc #endif /* CONFIG_SYSCTL_SYSCALL */ /* - * ctl_perm does NOT grant the superuser all rights automatically, because + * sysctl_perm does NOT grant the superuser all rights automatically, because * some sysctl variables are readonly even to root. */ @@ -1210,7 +1210,7 @@ static int test_perm(int mode, int op) return -EACCES; } -static inline int ctl_perm(ctl_table *table, int op) +int sysctl_perm(ctl_table *table, int op) { int error; error = security_sysctl(table, op); @@ -1237,7 +1237,7 @@ repeat: if (n == table->ctl_name) { int error; if (table->child) { - if (ctl_perm(table, 001)) + if (sysctl_perm(table, 001)) return -EPERM; name++; nlen--; @@ -1266,7 +1266,7 @@ int do_sysctl_strategy (ctl_table *table op |= 004; if (newval) op |= 002; - if (ctl_perm(table, op)) + if (sysctl_perm(table, op)) return -EPERM; if (table->strategy) { @@ -1536,7 +1536,7 @@ static ssize_t do_rw_proc(int write, str goto out; error = -EPERM; op = (write ? 002 : 004); - if (ctl_perm(table, op)) + if (sysctl_perm(table, op)) goto out; /* careful: calling conventions are nasty here */ _