diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:21:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:21:17 +0000 |
| commit | 0cebaafa6e721bda850ee88e84c4712643601e49 (patch) | |
| tree | 85c243ac3ab8568af3a1457ae5ba92db2eb563bd | |
| parent | 14a163ca58d26b6663aef00990bc1093cc9fd5d1 (diff) | |
| download | upstream-0cebaafa6e721bda850ee88e84c4712643601e49.tar.gz upstream-0cebaafa6e721bda850ee88e84c4712643601e49.tar.bz2 upstream-0cebaafa6e721bda850ee88e84c4712643601e49.zip | |
kernel: add missing check for skb->dev on netfilter xfrm optimization patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43567
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch index 5724367c1f..1caf1ef59c 100644 --- a/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch +++ b/target/linux/generic/patches-3.10/616-net_optimize_xfrm_calls.patch @@ -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); diff --git a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch index a4e4157300..2a64d5420a 100644 --- a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch +++ b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch @@ -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); diff --git a/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch index a4e4157300..2a64d5420a 100644 --- a/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch +++ b/target/linux/generic/patches-3.18/616-net_optimize_xfrm_calls.patch @@ -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); |