From: Greg Kroah-Hartman Date: Wed, 19 Apr 2017 11:37:32 +0000 (+0200) Subject: updated version of zram-do-not-use-copy_page-with-non-page-aligned-address.patch X-Git-Tag: v4.4.63~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c38c4304c94eb0b7adda2b121fa4adad1b1f15b6;p=thirdparty%2Fkernel%2Fstable-queue.git updated version of zram-do-not-use-copy_page-with-non-page-aligned-address.patch --- diff --git a/queue-4.10/series b/queue-4.10/series index 4d6ea526020..e63ef201ab4 100644 --- a/queue-4.10/series +++ b/queue-4.10/series @@ -5,7 +5,6 @@ tcmu-fix-wrongly-calculating-of-the-base_command_size.patch tcmu-skip-data-out-blocks-before-gathering-data-in-buffer-for-bidi-case.patch thp-fix-madv_dontneed-vs.-madv_free-race.patch thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch -zram-do-not-use-copy_page-with-non-page-aligned-address.patch zsmalloc-expand-class-bit.patch orangefs-free-superblock-when-mount-fails.patch drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch @@ -52,3 +51,4 @@ ftrace-fix-removing-of-second-function-probe.patch drm-i915-gvt-set-the-correct-default-value-of-ctx-status-ptr.patch char-lack-of-bool-string-made-config_devport-always-on.patch revert-mips-lantiq-fix-cascaded-irq-setup.patch +zram-do-not-use-copy_page-with-non-page-aligned-address.patch diff --git a/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch b/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch index 0a4514a71c3..e1dd8b43b8b 100644 --- a/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch +++ b/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch @@ -42,12 +42,19 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- - drivers/block/zram/zram_drv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + drivers/block/zram/zram_drv.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -589,7 +589,7 @@ static int zram_decompress_page(struct z +@@ -583,13 +583,13 @@ static int zram_decompress_page(struct z + + if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) { + bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); +- clear_page(mem); ++ memset(mem, 0, PAGE_SIZE); + return 0; + } cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO); if (size == PAGE_SIZE) { diff --git a/queue-4.9/series b/queue-4.9/series index a5b5b0b5bbc..8bf622bc949 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,7 +4,6 @@ tcmu-fix-wrongly-calculating-of-the-base_command_size.patch tcmu-skip-data-out-blocks-before-gathering-data-in-buffer-for-bidi-case.patch thp-fix-madv_dontneed-vs.-madv_free-race.patch thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch -zram-do-not-use-copy_page-with-non-page-aligned-address.patch zsmalloc-expand-class-bit.patch orangefs-free-superblock-when-mount-fails.patch drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch @@ -44,3 +43,4 @@ ftrace-fix-removing-of-second-function-probe.patch char-lack-of-bool-string-made-config_devport-always-on.patch revert-mips-lantiq-fix-cascaded-irq-setup.patch kvm-fix-page-struct-leak-in-handle_vmon.patch +zram-do-not-use-copy_page-with-non-page-aligned-address.patch diff --git a/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch b/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch index 508042636ec..bfe5abe41a9 100644 --- a/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch +++ b/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch @@ -41,13 +41,21 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman + --- - drivers/block/zram/zram_drv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + drivers/block/zram/zram_drv.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -588,7 +588,7 @@ static int zram_decompress_page(struct z +@@ -582,13 +582,13 @@ static int zram_decompress_page(struct z + + if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) { + bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); +- clear_page(mem); ++ memset(mem, 0, PAGE_SIZE); + return 0; + } cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO); if (size == PAGE_SIZE) {