[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20190516.141607.1682504302871816565.davem@davemloft.net>
Date: Thu, 16 May 2019 14:16:07 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: fw@...len.de
Cc: netdev@...r.kernel.org, steffen.klassert@...unet.com,
sfr@...b.auug.org.au
Subject: Re: [PATCH net] xfrm: ressurrect "Fix uninitialized memory read in
_decode_session4"
From: Florian Westphal <fw@...len.de>
Date: Thu, 16 May 2019 11:28:16 +0200
> 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@...b.auug.org.au>
> Signed-off-by: Florian Westphal <fw@...len.de>
Steffen, I'm going to apply this directly, I hope that is OK with you.
Applied, thanks Florian.
Powered by blists - more mailing lists