Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64396acc authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

sysctl: fix ax25 checks 



Fix:

sysctl table check failed: /net/ax25/ax0/ax25_default_mode .3.9.1.2 Unknown
sysctl binary path
Pid: 2936, comm: kissattach Not tainted 2.6.24-rc5 #1
 [<c012ca6a>] set_fail+0x3b/0x43
 [<c012ce7a>] sysctl_check_table+0x408/0x456
 [<c012ce8e>] sysctl_check_table+0x41c/0x456
 [<c012ce8e>] sysctl_check_table+0x41c/0x456
 ...

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Bernard Pidoux <pidoux@ccr.jussieu.fr>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 421d9919

kernel/sysctl_check.c

+6 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static struct trans_ctl_table trans_net_netrom_table[] = { 
	{}

};



static struct trans_ctl_table trans_net_ax25_table[] = {

static struct trans_ctl_table trans_net_ax25_param_table[] = {

	{ NET_AX25_IP_DEFAULT_MODE,	"ip_default_mode" },

	{ NET_AX25_DEFAULT_MODE,	"ax25_default_mode" },

	{ NET_AX25_BACKOFF_TYPE,	"backoff_type" },
@@ -446,6 +446,11 @@ static struct trans_ctl_table trans_net_ax25_table[] = { 
	{}

};



static struct trans_ctl_table trans_net_ax25_table[] = {

	{ 0, NULL, trans_net_ax25_param_table },

	{}

};



static struct trans_ctl_table trans_net_bridge_table[] = {

	{ NET_BRIDGE_NF_CALL_ARPTABLES,		"bridge-nf-call-arptables" },

	{ NET_BRIDGE_NF_CALL_IPTABLES,		"bridge-nf-call-iptables" },