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

[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

include/linux/sysctl.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct __sysctl_args { 


/* For internal pattern-matching use only: */

#ifdef __KERNEL__

#define CTL_ANY		-1	/* Matches any name */

#define CTL_NONE	0

#define CTL_UNNUMBERED	CTL_NONE	/* sysctl without a binary number */

#endif

kernel/sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ repeat: 
	for ( ; table->ctl_name || table->procname; table++) {

		if (!table->ctl_name)

			continue;

		if (n == table->ctl_name || table->ctl_name == CTL_ANY) {

		if (n == table->ctl_name) {

			int error;

			if (table->child) {

				if (ctl_perm(table, 001))

CRA Git | Maintained and supported by SUSTech CRA and CCSE