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 /include/net/ip_vs.h | |
| parent | b4232a22776aa5d063f890d21ca69870dbbe431b (diff) | |
| download | linux-3.10-a09d19779f3ffac6e16821accc2c1cc4df1b643a.tar.gz linux-3.10-a09d19779f3ffac6e16821accc2c1cc4df1b643a.tar.bz2 linux-3.10-a09d19779f3ffac6e16821accc2c1cc4df1b643a.zip | |
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 'include/net/ip_vs.h')
| -rw-r--r-- | include/net/ip_vs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 30b49ed72f0..4d1b71ae82b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -52,7 +52,7 @@ static inline struct net *skb_net(const struct sk_buff *skb) */ if (likely(skb->dev && skb->dev->nd_net)) return dev_net(skb->dev); - if (skb_dst(skb)->dev) + if (skb_dst(skb) && skb_dst(skb)->dev) return dev_net(skb_dst(skb)->dev); WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n", __func__, __LINE__); |