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

Commit b5ec8eea authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv4: fix ip_send_skb() 



ip_send_skb() can send orphaned skb, so we must pass the net pointer to
avoid possible NULL dereference in error path.

Bug added by commit 3a7c384f (ipv4: tcp: unicast_sock should not
land outside of TCP stack)

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63d02d15

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern struct sk_buff *__ip_make_skb(struct sock *sk, 
				      struct flowi4 *fl4,

				      struct sk_buff_head *queue,

				      struct inet_cork *cork);

extern int		ip_send_skb(struct sk_buff *skb);

extern int		ip_send_skb(struct net *net, struct sk_buff *skb);

extern int		ip_push_pending_frames(struct sock *sk, struct flowi4 *fl4);

extern void		ip_flush_pending_frames(struct sock *sk);

extern struct sk_buff  *ip_make_skb(struct sock *sk,

net/ipv4/ip_output.c

+2 −3
Original line number Diff line number Diff line
@@ -1366,9 +1366,8 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	return skb;

}



int ip_send_skb(struct sk_buff *skb)

int ip_send_skb(struct net *net, struct sk_buff *skb)

{

	struct net *net = sock_net(skb->sk);

	int err;



	err = ip_local_out(skb);
@@ -1391,7 +1390,7 @@ int ip_push_pending_frames(struct sock *sk, struct flowi4 *fl4) 
		return 0;



	/* Netfilter gets whole the not fragmented skb. */

	return ip_send_skb(skb);

	return ip_send_skb(sock_net(sk), skb);

}



/*

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4) 
		uh->check = CSUM_MANGLED_0;



send:

	err = ip_send_skb(skb);

	err = ip_send_skb(sock_net(sk), skb);

	if (err) {

		if (err == -ENOBUFS && !inet->recverr) {

			UDP_INC_STATS_USER(sock_net(sk),