Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1614527

[PATCH 3.2 1/4] ipv4: keep skb->dst around in presence of IP options

Show all headers | View raw

3.2.88-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>

Upstream commit 34b2cef20f19c87999fff3da4071e66937db9644
("ipv4: keep skb->dst around in presence of IP options") incorrectly
root caused commit d826eb14ecef ("ipv4: PKTINFO doesnt need dst
reference") as bug origin.

This patch should fix the issue for 3.2.xx stable kernels, since IPv4
options seem to get more traction these days, after years of oblivion ;)

Fixes: f84af32cbca70 ("net: ip_queue_rcv_skb() helper"))
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Anarcheuz Fritz <anarcheuz@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1009,7 +1009,8 @@ e_inval:
  */
 int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
-	if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO))
+	if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO) &&
+	    !IPCB(skb)->opt.optlen)
 		skb_dst_drop(skb);
 	return sock_queue_rcv_skb(sk, skb);
 }

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.2 0/4] 3.2.88-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-04-01 15:30 +0200
  [PATCH 3.2 3/4] l2tp: fix racy SOCK_ZAPPED flag check in  l2tp_ip{,6}_bind() Ben Hutchings <ben@decadent.org.uk> - 2017-04-01 15:30 +0200
  [PATCH 3.2 4/4] keys: Guard against null match function in  keyring_search_aux() Ben Hutchings <ben@decadent.org.uk> - 2017-04-01 15:30 +0200
  [PATCH 3.2 2/4] mm/huge_memory.c: fix up "mm/huge_memory.c:  respect FOLL_FORCE/FOLL_COW for thp" backport Ben Hutchings <ben@decadent.org.uk> - 2017-04-01 15:30 +0200
  [PATCH 3.2 1/4] ipv4: keep skb->dst around in presence of IP  options Ben Hutchings <ben@decadent.org.uk> - 2017-04-01 15:30 +0200
  Re: [PATCH 3.2 0/4] 3.2.88-rc1 review Guenter Roeck <linux@roeck-us.net> - 2017-04-01 19:30 +0200
    Re: [PATCH 3.2 0/4] 3.2.88-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-04-02 00:50 +0200
  Re: [PATCH 3.2 0/4] 3.2.88-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-04-02 05:10 +0200

csiph-web