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

Commit 9b300960 authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: add net device to skb before UDP xmit 



Prior to this patch enabling a IPv4 UDP bearer caused a null pointer
dereference in iptunnel_xmit_stats(), when it tried to dereference the
net device from the skb. To resolve this we now point the skb device
to the net device resolved from the routing table.

Fixes: 039f5062 (ip_tunnel: Move stats update to iptunnel_xmit())
Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 962d8cdc

net/tipc/udp_media.c

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb, 
			err = PTR_ERR(rt);

			goto tx_error;

		}



		skb->dev = rt->dst.dev;

		ttl = ip4_dst_hoplimit(&rt->dst);

		udp_tunnel_xmit_skb(rt, ub->ubsock->sk, skb, src->ipv4.s_addr,

				    dst->ipv4.s_addr, 0, ttl, 0, src->udp_port,