diff options
author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2011-04-04 15:25:18 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-04-04 15:25:18 +0200 |
commit | a09d19779f3ffac6e16821accc2c1cc4df1b643a (patch) | |
tree | 26ae50dcffd19813b21f3cacb9a11a1908dcf3f0 /net | |
parent | b4232a22776aa5d063f890d21ca69870dbbe431b (diff) | |
download | op-kernel-dev-a09d19779f3ffac6e16821accc2c1cc4df1b643a.zip op-kernel-dev-a09d19779f3ffac6e16821accc2c1cc4df1b643a.tar.gz |
IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()
ipvsadm -ln --daemon will trigger a Null pointer exception because
ip_vs_genl_dump_daemons() uses skb_net() instead of skb_sknet().
To prevent others from NULL ptr a check is made in ip_vs.h skb_net().
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 33733c8..ae47090 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3120,7 +3120,7 @@ nla_put_failure: static int ip_vs_genl_dump_daemons(struct sk_buff *skb, struct netlink_callback *cb) { - struct net *net = skb_net(skb); + struct net *net = skb_sknet(skb); struct netns_ipvs *ipvs = net_ipvs(net); mutex_lock(&__ip_vs_mutex); |