]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit43b572bade2806d9579f2d0060cc6da8675c7cf5
treea49339793703e5cf19569a55ab65ba52bd41c289
parent6f91e0addec4d138c60c6519ee050464845380e4
xfrm: ressurrect "Fix uninitialized memory read in _decode_session4"

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

5e1eee92be9c ("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, 1be6630407c64 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: 3ded93b5d61d4 ("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