From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60554 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbdALUsb (ORCPT ); Thu, 12 Jan 2017 15:48:31 -0500 Subject: Patch "inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets" has been added to the 4.9-stable tree To: willemb@google.com, davem@davemloft.net, gregkh@linuxfoundation.org, njagabar@cloudmark.com Cc: , From: Date: Thu, 12 Jan 2017 21:38:42 +0100 Message-ID: <148425352215152@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: inet-fix-ip-v6-_recvorigdstaddr-for-udp-sockets.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Jan 12 21:37:26 CET 2017 From: Willem de Bruijn Date: Thu, 22 Dec 2016 18:19:16 -0500 Subject: inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets From: Willem de Bruijn [ Upstream commit 39b2dd765e0711e1efd1d1df089473a8dd93ad48 ] 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: e6afc8ace6dd ("udp: remove headers from UDP packets before queueing") Reported-by: Nisar Jagabar Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_sockglue.c | 2 +- net/ipv6/datagram.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -137,7 +137,7 @@ static void ip_cmsg_recv_dstaddr(struct 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 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -700,7 +700,7 @@ void ip6_datagram_recv_specific_ctl(stru 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. Patches currently in stable-queue which might be from willemb@google.com are queue-4.9/inet-fix-ip-v6-_recvorigdstaddr-for-udp-sockets.patch