From 4bf17f66e2802df7d072d2559b19736e48650db0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 8 Feb 2018 18:15:22 +0100 Subject: [PATCH] 4.15-stable patches added patches: crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch --- ...pt-fix-s-g-table-for-test_aead_speed.patch | 40 +++++++++++++++++++ queue-4.15/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-4.15/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch diff --git a/queue-4.15/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch b/queue-4.15/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch new file mode 100644 index 00000000000..99bc606b07a --- /dev/null +++ b/queue-4.15/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch @@ -0,0 +1,40 @@ +From 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 Mon Sep 17 00:00:00 2001 +From: Robert Baronescu +Date: Tue, 10 Oct 2017 13:21:59 +0300 +Subject: crypto: tcrypt - fix S/G table for test_aead_speed() + +From: Robert Baronescu + +commit 5c6ac1d4f8fbdbed65dbeb8cf149d736409d16a1 upstream. + +In case buffer length is a multiple of PAGE_SIZE, +the S/G table is incorrectly generated. +Fix this by handling buflen = k * PAGE_SIZE separately. + +Signed-off-by: Robert Baronescu +Signed-off-by: Herbert Xu +Signed-off-by: Horia Geantă +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/tcrypt.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/crypto/tcrypt.c ++++ b/crypto/tcrypt.c +@@ -198,11 +198,13 @@ static void sg_init_aead(struct scatterl + } + + sg_init_table(sg, np + 1); +- np--; ++ if (rem) ++ np--; + for (k = 0; k < np; k++) + sg_set_buf(&sg[k + 1], xbuf[k], PAGE_SIZE); + +- sg_set_buf(&sg[k + 1], xbuf[k], rem); ++ if (rem) ++ sg_set_buf(&sg[k + 1], xbuf[k], rem); + } + + static void test_aead_speed(const char *algo, int enc, unsigned int secs, diff --git a/queue-4.15/series b/queue-4.15/series index 8bd80f1c795..813a1d24a55 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -20,3 +20,4 @@ media-mtk-vcodec-add-missing-module_license-description.patch media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch media-tegra-cec-add-missing-module_description-author-license.patch gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch +crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch -- 2.47.2