On Thu, Apr 16, 2020 at 4:37 AM Sasha Levin sashal@kernel.org wrote:
On Wed, Apr 15, 2020 at 01:07:08PM +0200, gregkh@linuxfoundation.org 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@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 504e84abec7a635b861afd8d7f92ecd13eaa2b09 Mon Sep 17 00:00:00 2001 From: Gilad Ben-Yossef gilad@benyossef.com Date: Wed, 29 Jan 2020 16:37:55 +0200 Subject: [PATCH] crypto: ccree - only try to map auth tag if needed
Make sure to only add the size of the auth tag to the source mapping for encryption if it is an in-place operation. Failing to do this previously caused us to try and map auth size len bytes from a NULL mapping and crashing if both the cryptlen and assoclen are zero.
Reported-by: Geert Uytterhoeven geert+renesas@glider.be Tested-by: Geert Uytterhoeven geert+renesas@glider.be Signed-off-by: Gilad Ben-Yossef gilad@benyossef.com Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Herbert Xu herbert@gondor.apana.org.au
Grabbing:
da3cf67f1bcf ("crypto: ccree - don't mangle the request assoclen") 9f31eb6e08cc ("crypto: ccree - zero out internal struct before use") ccba2f1112d4 ("crypto: ccree - improve error handling")
resolved this conflict.
Acked-by: Gilad Ben-Yossef gilad@benyossef.com
Thanks, Gilad