Commit 6703ddfc authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

[PATCH] sysctl: remove support for CTL_ANY

There are currently no users in the kernel for CTL_ANY and it only has effect
on the binary interface which is practically unused.

So this complicates sysctl lookups for no good reason so just remove it.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2abc26fc
...@@ -53,7 +53,6 @@ struct __sysctl_args { ...@@ -53,7 +53,6 @@ struct __sysctl_args {
/* For internal pattern-matching use only: */ /* For internal pattern-matching use only: */
#ifdef __KERNEL__ #ifdef __KERNEL__
#define CTL_ANY -1 /* Matches any name */
#define CTL_NONE 0 #define CTL_NONE 0
#define CTL_UNNUMBERED CTL_NONE /* sysctl without a binary number */ #define CTL_UNNUMBERED CTL_NONE /* sysctl without a binary number */
#endif #endif
......
...@@ -1170,7 +1170,7 @@ static int parse_table(int __user *name, int nlen, ...@@ -1170,7 +1170,7 @@ static int parse_table(int __user *name, int nlen,
for ( ; table->ctl_name || table->procname; table++) { for ( ; table->ctl_name || table->procname; table++) {
if (!table->ctl_name) if (!table->ctl_name)
continue; continue;
if (n == table->ctl_name || table->ctl_name == CTL_ANY) { if (n == table->ctl_name) {
int error; int error;
if (table->child) { if (table->child) {
if (ctl_perm(table, 001)) if (ctl_perm(table, 001))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment