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

Commit 39b2dd76 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets 



Socket cmsg IP(V6)_RECVORIGDSTADDR checks that port range lies within
the packet. For sockets that have transport headers pulled, transport
offset can be negative. Use signed comparison to avoid overflow.

Fixes: e6afc8ac ("udp: remove headers from UDP packets before queueing")
Reported-by: default avatarNisar Jagabar <njagabar@cloudmark.com>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9aa340a5

net/ipv4/ip_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void ip_cmsg_recv_dstaddr(struct msghdr *msg, struct sk_buff *skb) 
	const struct iphdr *iph = ip_hdr(skb);

	__be16 *ports = (__be16 *)skb_transport_header(skb);



	if (skb_transport_offset(skb) + 4 > skb->len)

	if (skb_transport_offset(skb) + 4 > (int)skb->len)

		return;



	/* All current transport protocols have the port numbers in the

net/ipv6/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, 
		struct sockaddr_in6 sin6;

		__be16 *ports = (__be16 *) skb_transport_header(skb);



		if (skb_transport_offset(skb) + 4 <= skb->len) {

		if (skb_transport_offset(skb) + 4 <= (int)skb->len) {

			/* All current transport protocols have the port numbers in the

			 * first four bytes of the transport header and this function is

			 * written with this assumption in mind.