From: Greg Kroah-Hartman Date: Thu, 8 Feb 2018 17:15:48 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.15.3~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f753de94c61feeb42b97b41816b3f2ae1e769522;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch --- diff --git a/queue-4.4/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch b/queue-4.4/crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch new file mode 100644 index 00000000000..d8fd3f99761 --- /dev/null +++ b/queue-4.4/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 +@@ -291,11 +291,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.4/series b/queue-4.4/series index 74d6a0a6b6e..02b0d530269 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -33,3 +33,4 @@ vhost_net-stop-device-during-reset-owner.patch media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch keys-encrypted-fix-buffer-overread-in-valid_master_desc.patch don-t-put-symlink-bodies-in-pagecache-into-highmem.patch +crypto-tcrypt-fix-s-g-table-for-test_aead_speed.patch