On Wed, Apr 15, 2020 at 2:06 PM <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > The patch below does not apply to the 4.19-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > From ce0fc6db38decf0d2919bfe783de6d6b76e421a9 Mon Sep 17 00:00:00 2001 > From: Gilad Ben-Yossef <gilad@xxxxxxxxxxxxx> > Date: Wed, 29 Jan 2020 16:37:54 +0200 > Subject: [PATCH] crypto: ccree - protect against empty or NULL scatterlists > Thank you Greg. Taking these additional commits will resolve the conflict and produce correct behaviour: b7ec8530687a ("crypto: ccree - use std api when possible") c776f7d37b6b ("crypto: ccree - make AEAD sgl iterator well behaved") 05c292afb0c0 ("crypto: ccree - zap entire sg on aead request unmap") Cheers, Gilad