projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asoc-v4.1' into asoc-next
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv6
/
xfrm6_policy.c
diff --git
a/net/ipv6/xfrm6_policy.c
b/net/ipv6/xfrm6_policy.c
index 48bf5a06847bd59db7834758b22aa9208d727940..8d2d01b4800a197eaaa64fb184f56c58920ad462 100644
(file)
--- a/
net/ipv6/xfrm6_policy.c
+++ b/
net/ipv6/xfrm6_policy.c
@@
-200,6
+200,7
@@
_decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
#if IS_ENABLED(CONFIG_IPV6_MIP6)
case IPPROTO_MH:
+ offset += ipv6_optlen(exthdr);
if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
struct ip6_mh *mh;