From: Greg Kroah-Hartman Date: Wed, 19 Apr 2017 11:33:04 +0000 (+0200) Subject: delete zram-fix-operator-precedence-to-get-offset.patch X-Git-Tag: v4.4.63~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15fdd0349cbd1779c95347118fff726d64fd23cf;p=thirdparty%2Fkernel%2Fstable-queue.git delete zram-fix-operator-precedence-to-get-offset.patch --- diff --git a/queue-4.10/series b/queue-4.10/series index e9a477c63ae..4d6ea526020 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-fix-operator-precedence-to-get-offset.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 diff --git a/queue-4.10/zram-fix-operator-precedence-to-get-offset.patch b/queue-4.10/zram-fix-operator-precedence-to-get-offset.patch deleted file mode 100644 index ebbd06d9b5e..00000000000 --- a/queue-4.10/zram-fix-operator-precedence-to-get-offset.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 Mon Sep 17 00:00:00 2001 -From: Minchan Kim -Date: Thu, 13 Apr 2017 14:56:35 -0700 -Subject: zram: fix operator precedence to get offset - -From: Minchan Kim - -commit 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 upstream. - -In zram_rw_page, the logic to get offset is wrong by operator precedence -(i.e., "<<" is higher than "&"). With wrong offset, zram can corrupt -the user's data. This patch fixes it. - -Fixes: 8c7f01025 ("zram: implement rw_page operation of zram") -Link: http://lkml.kernel.org/r/1492042622-12074-1-git-send-email-minchan@kernel.org -Signed-off-by: Minchan Kim -Cc: Sergey Senozhatsky -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/block/zram/zram_drv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -999,7 +999,7 @@ static int zram_rw_page(struct block_dev - } - - index = sector >> SECTORS_PER_PAGE_SHIFT; -- offset = sector & (SECTORS_PER_PAGE - 1) << SECTOR_SHIFT; -+ offset = (sector & (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT; - - bv.bv_page = page; - bv.bv_len = PAGE_SIZE; diff --git a/queue-4.4/series b/queue-4.4/series index 270680505a9..ce863e9a9bd 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,6 +1,5 @@ cgroup-kthread-close-race-window-where-new-kthreads-can-be-migrated-to-non-root-cgroups.patch thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch -zram-fix-operator-precedence-to-get-offset.patch drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch cifs-store-results-of-cifs_reopen_file-to-avoid-infinite-wait.patch diff --git a/queue-4.4/zram-fix-operator-precedence-to-get-offset.patch b/queue-4.4/zram-fix-operator-precedence-to-get-offset.patch deleted file mode 100644 index fa63eb17a66..00000000000 --- a/queue-4.4/zram-fix-operator-precedence-to-get-offset.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 Mon Sep 17 00:00:00 2001 -From: Minchan Kim -Date: Thu, 13 Apr 2017 14:56:35 -0700 -Subject: zram: fix operator precedence to get offset - -From: Minchan Kim - -commit 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 upstream. - -In zram_rw_page, the logic to get offset is wrong by operator precedence -(i.e., "<<" is higher than "&"). With wrong offset, zram can corrupt -the user's data. This patch fixes it. - -Fixes: 8c7f01025 ("zram: implement rw_page operation of zram") -Link: http://lkml.kernel.org/r/1492042622-12074-1-git-send-email-minchan@kernel.org -Signed-off-by: Minchan Kim -Cc: Sergey Senozhatsky -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/block/zram/zram_drv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -953,7 +953,7 @@ static int zram_rw_page(struct block_dev - } - - index = sector >> SECTORS_PER_PAGE_SHIFT; -- offset = sector & (SECTORS_PER_PAGE - 1) << SECTOR_SHIFT; -+ offset = (sector & (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT; - - bv.bv_page = page; - bv.bv_len = PAGE_SIZE; diff --git a/queue-4.9/series b/queue-4.9/series index 9e7d0c73b56..a5b5b0b5bbc 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-fix-operator-precedence-to-get-offset.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 diff --git a/queue-4.9/zram-fix-operator-precedence-to-get-offset.patch b/queue-4.9/zram-fix-operator-precedence-to-get-offset.patch deleted file mode 100644 index 306d00ec81f..00000000000 --- a/queue-4.9/zram-fix-operator-precedence-to-get-offset.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 Mon Sep 17 00:00:00 2001 -From: Minchan Kim -Date: Thu, 13 Apr 2017 14:56:35 -0700 -Subject: zram: fix operator precedence to get offset - -From: Minchan Kim - -commit 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5 upstream. - -In zram_rw_page, the logic to get offset is wrong by operator precedence -(i.e., "<<" is higher than "&"). With wrong offset, zram can corrupt -the user's data. This patch fixes it. - -Fixes: 8c7f01025 ("zram: implement rw_page operation of zram") -Link: http://lkml.kernel.org/r/1492042622-12074-1-git-send-email-minchan@kernel.org -Signed-off-by: Minchan Kim -Cc: Sergey Senozhatsky -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/block/zram/zram_drv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -998,7 +998,7 @@ static int zram_rw_page(struct block_dev - } - - index = sector >> SECTORS_PER_PAGE_SHIFT; -- offset = sector & (SECTORS_PER_PAGE - 1) << SECTOR_SHIFT; -+ offset = (sector & (SECTORS_PER_PAGE - 1)) << SECTOR_SHIFT; - - bv.bv_page = page; - bv.bv_len = PAGE_SIZE;