Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf693f7b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 



Steffen Klassert says:

====================
ipsec 2015-01-26

Just two small fixes for _decode_session6() where we
might decode to wrong header information in some rare
situations.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e9e16e6 f8556919

net/ipv6/xfrm6_policy.c

+8 −2
Original line number Diff line number Diff line
@@ -130,12 +130,18 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse) 
{

	struct flowi6 *fl6 = &fl->u.ip6;

	int onlyproto = 0;

	u16 offset = skb_network_header_len(skb);

	const struct ipv6hdr *hdr = ipv6_hdr(skb);

	u16 offset = sizeof(*hdr);

	struct ipv6_opt_hdr *exthdr;

	const unsigned char *nh = skb_network_header(skb);

	u8 nexthdr = nh[IP6CB(skb)->nhoff];

	u16 nhoff = IP6CB(skb)->nhoff;

	int oif = 0;

	u8 nexthdr;



	if (!nhoff)

		nhoff = offsetof(struct ipv6hdr, nexthdr);



	nexthdr = nh[nhoff];



	if (skb_dst(skb))

		oif = skb_dst(skb)->dev->ifindex;