xfrm: ressurrect "Fix uninitialized memory read in _decode_session4"
authorFlorian Westphal <fw@strlen.de>
Thu, 16 May 2019 09:28:16 +0000 (11:28 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 May 2019 21:14:47 +0000 (14:14 -0700)
commit858e5400e682370d0f8d217fcd6fd6ae5b256f5f
treea49339793703e5cf19569a55ab65ba52bd41c289
parent7e27e8d6130c5e88fac9ddec4249f7f2337fe7f8
xfrm: ressurrect "Fix uninitialized memory read in _decode_session4"

This resurrects commit 8742dc86d0c7a9628
("xfrm4: Fix uninitialized memory read in _decode_session4"),
which got lost during a merge conflict resolution between ipsec-next
and net-next tree.

c53ac41e3720 ("xfrm: remove decode_session indirection from afinfo_policy")
in ipsec-next moved the (buggy) _decode_session4 from
net/ipv4/xfrm4_policy.c to net/xfrm/xfrm_policy.c.
In mean time, 8742dc86d0c7a was applied to ipsec.git and fixed the
problem in the "old" location.

When the trees got merged, the moved, old function was kept.
This applies the "lost" commit again, to the new location.

Fixes: a658a3f2ecbab ("Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/xfrm/xfrm_policy.c