Author: nbd
Date: 2014-12-08 13:21:17 +0100 (Mon, 08 Dec 2014)
New Revision: 43567

Modified:
   trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
   trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
   trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch
Log:
kernel: add missing check for skb->dev on netfilter xfrm optimization patch

Signed-off-by: Felix Fietkau <[email protected]>

Modified: 
trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch
===================================================================
--- trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:06:02 UTC (rev 43566)
+++ trunk/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:21:17 UTC (rev 43567)
@@ -4,7 +4,7 @@
        struct dst_entry *dst;
        int err;
  
-+      if (!dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++      if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
 +              return 0;
 +
        err = xfrm_decode_session(skb, &fl, family);

Modified: 
trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
===================================================================
--- trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:06:02 UTC (rev 43566)
+++ trunk/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:21:17 UTC (rev 43567)
@@ -4,7 +4,7 @@
        struct dst_entry *dst;
        int err;
  
-+      if (!dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++      if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
 +              return 0;
 +
        err = xfrm_decode_session(skb, &fl, family);

Modified: 
trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch
===================================================================
--- trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:06:02 UTC (rev 43566)
+++ trunk/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch   
2014-12-08 12:21:17 UTC (rev 43567)
@@ -4,7 +4,7 @@
        struct dst_entry *dst;
        int err;
  
-+      if (!dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
++      if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
 +              return 0;
 +
        err = xfrm_decode_session(skb, &fl, family);
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to