[PATCH net-next] ipvs: Avoid null-pointer deref in debug code
From: Alex Gartrell <hidden>
Date: 2014-10-06 00:55:26
Also in:
lvs-devel
Subsystem:
ipvs, netfilter, networking [general], the rest · Maintainers:
Simon Horman, Julian Anastasov, Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2014-10-17 · Re: [PATCH net-next] ipvs: Avoid null-pointer deref in debug code · Simon Horman <horms@verge.net.au>
- 2014-10-06 · Re: [PATCH net-next] ipvs: Avoid null-pointer deref in debug code · Julian Anastasov <ja@ssi.bg>
- 2014-10-06 · [PATCH net-next] ipvs: Avoid null-pointer deref in debug code · Alex Gartrell <hidden>
Ensure that the pointer is non-NULL before dereferencing it for debugging purposes. Reported-by: Dan Carpenter <redacted> Signed-off-by: Alex Gartrell <redacted> --- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 91f17c1..06bba9b 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c@@ -316,7 +316,7 @@ __ip_vs_get_out_rt(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest, if (unlikely(crosses_local_route_boundary(skb_af, skb, rt_mode, local))) { IP_VS_DBG_RL("We are crossing local and non-local addresses" - " daddr=%pI4\n", &dest->addr.ip); + " daddr=%pI4\n", dest ? &dest->addr.ip : NULL); goto err_put; }
@@ -458,7 +458,7 @@ __ip_vs_get_out_rt_v6(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest, if (unlikely(crosses_local_route_boundary(skb_af, skb, rt_mode, local))) { IP_VS_DBG_RL("We are crossing local and non-local addresses" - " daddr=%pI6\n", &dest->addr.in6); + " daddr=%pI6\n", dest ? &dest->addr.in6 : NULL); goto err_put; }
--
Alex Gartrell <agartrell@fb.com>