drop dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch from everywhere

diff --git a/queue-4.14/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-4.14/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 1364da4..0000000
--- a/queue-4.14/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -793,12 +793,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-4.14/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-4.14/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index be15d0600b4330415a60409b419f819ecdd563a4..1ee8665aae1e0cdb642f616cf1b5427e82255dbd 100644 (file)
--- a/queue-4.14/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-4.14/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1285,6 +1285,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1286,6 +1286,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-4.14/series b/queue-4.14/series
index 163270b6d7b7869da52456a88d5b9e176b628eb3..2a49393995b921441a8937df6fd256e8a49f102a 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -11,7 +11,6 @@ alsa-hda-realtek-reset-eapd-coeff-to-default-value-for-alc287.patch
 revert-rapidio-fix-a-null-pointer-dereference-when-create_workqueue-fails.patch
 rapidio-handle-create_workqueue-failure.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch
 revert-net-stmicro-fix-a-missing-check-of-clk_prepare.patch

diff --git a/queue-4.19/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-4.19/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 08f3d5d..0000000
--- a/queue-4.19/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -794,12 +794,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-4.19/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-4.19/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index be15d0600b4330415a60409b419f819ecdd563a4..1ee8665aae1e0cdb642f616cf1b5427e82255dbd 100644 (file)
--- a/queue-4.19/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-4.19/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1285,6 +1285,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1286,6 +1286,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-4.19/series b/queue-4.19/series
index 70793c5aa2e7afd794649c43599e90c8796be65e..51cad92e4b5544b2e0808bd248eb10f7b3df51fa 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -20,7 +20,6 @@ revert-rapidio-fix-a-null-pointer-dereference-when-create_workqueue-fails.patch
 rapidio-handle-create_workqueue-failure.patch
 revert-serial-mvebu-uart-fix-to-avoid-a-potential-null-pointer-dereference.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch
 revert-net-stmicro-fix-a-missing-check-of-clk_prepare.patch

diff --git a/queue-4.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-4.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index f564729..0000000
--- a/queue-4.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -789,12 +789,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-4.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-4.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index 56c3b903da7086a52320d4a497d81b1190ce02ee..7f51949c1fd99a29c77db8552a6783145891bf82 100644 (file)
--- a/queue-4.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-4.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1264,6 +1264,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1265,6 +1265,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-4.4/series b/queue-4.4/series
index f8c8c2ef6aa8a9df62dc1f93d099b3a178df3d70..5e8b949b589df454ac2d0c09b74db30d26b6188c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -6,7 +6,6 @@ alsa-usb-audio-validate-ms-endpoint-descriptors.patch
 alsa-bebob-oxfw-fix-kconfig-entry-for-mackie-d.2-pro.patch
 revert-alsa-sb8-add-a-check-for-request_region.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch
 revert-net-stmicro-fix-a-missing-check-of-clk_prepare.patch

diff --git a/queue-4.9/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-4.9/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 360f548..0000000
--- a/queue-4.9/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -788,12 +788,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-4.9/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-4.9/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index 19bf3812504ec1d960b45dd69405d0d2b56d763e..56c3b903da7086a52320d4a497d81b1190ce02ee 100644 (file)
--- a/queue-4.9/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-4.9/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1263,6 +1263,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1264,6 +1264,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-4.9/series b/queue-4.9/series
index 1e0cf8cc53bc8ab9e12d4fa4973ef5ed3250881e..71cd254cdd93d36d0e1f5a7529a76456043e6def 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -10,7 +10,6 @@ revert-alsa-sb8-add-a-check-for-request_region.patch
 revert-rapidio-fix-a-null-pointer-dereference-when-create_workqueue-fails.patch
 rapidio-handle-create_workqueue-failure.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch
 revert-net-stmicro-fix-a-missing-check-of-clk_prepare.patch

diff --git a/queue-5.10/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-5.10/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 94a5096..0000000
--- a/queue-5.10/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -854,12 +854,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-5.10/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-5.10/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index f3d6a700546e5b334f2077e7788de4c21ab2d241..ed52cde2ba01414d550cd0dabd7737c96e90cc12 100644 (file)
--- a/queue-5.10/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-5.10/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1407,6 +1407,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1408,6 +1408,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-5.10/series b/queue-5.10/series
index 48f3e25281524ce89c9881a820abc42b688403fa..d1bfcc9e78f50d09c6d50efde8e71b4b59562b15 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -67,7 +67,6 @@ mmc-sdhci-pci-gli-increase-1.8v-regulator-wait.patch
 xen-pciback-redo-vf-placement-in-the-virtual-topology.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
 ipc-mqueue-msg-sem-avoid-relying-on-a-stack-reference-past-its-expiry.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 kcsan-fix-debugfs-initcall-return-type.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch

diff --git a/queue-5.12/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-5.12/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 94a5096..0000000
--- a/queue-5.12/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -854,12 +854,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-5.12/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-5.12/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index f3d6a700546e5b334f2077e7788de4c21ab2d241..ed52cde2ba01414d550cd0dabd7737c96e90cc12 100644 (file)
--- a/queue-5.12/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-5.12/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1407,6 +1407,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1408,6 +1408,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-5.12/series b/queue-5.12/series
index 22286744206803ed9c41f17262cfde6e87c70eff..e181c68a91df29c1a00e551ce3d6125f51b8389c 100644 (file)
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@ -90,7 +90,6 @@ xen-pciback-reconfigure-also-from-backend-watch-handler.patch
 ipc-mqueue-msg-sem-avoid-relying-on-a-stack-reference-past-its-expiry.patch
 userfaultfd-hugetlbfs-fix-new-flag-usage-in-error-path.patch
 revert-mm-gup-check-page-posion-status-for-coredump.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 kcsan-fix-debugfs-initcall-return-type.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch

diff --git a/queue-5.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch b/queue-5.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
deleted file mode 100644 (file)
index 94a5096..0000000
--- a/queue-5.4/dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ee06ddc4038f936b0d4459d37a7d4d844fb03db Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Fri, 7 May 2021 11:38:10 -0400
-Subject: dm snapshot: fix a crash when an origin has no snapshots
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 7ee06ddc4038f936b0d4459d37a7d4d844fb03db upstream.
-
-If an origin target has no snapshots, o->split_boundary is set to 0.
-This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
-
-Fix this by initializing chunk_size, and in turn split_boundary, to
-rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits
-into "unsigned" type.
-
-Reported-by: Michael Tokarev <mjt@tls.msk.ru>
-Tested-by: Michael Tokarev <mjt@tls.msk.ru>
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-snap.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/md/dm-snap.c
-+++ b/drivers/md/dm-snap.c
-@@ -854,12 +854,11 @@ static int dm_add_exception(void *contex
- static uint32_t __minimum_chunk_size(struct origin *o)
- {
-       struct dm_snapshot *snap;
--      unsigned chunk_size = 0;
-+      unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
- 
-       if (o)
-               list_for_each_entry(snap, &o->snapshots, list)
--                      chunk_size = min_not_zero(chunk_size,
--                                                snap->store->chunk_size);
-+                      chunk_size = min(chunk_size, snap->store->chunk_size);
- 
-       return (uint32_t) chunk_size;
- }

diff --git a/queue-5.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch b/queue-5.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
index f3d6a700546e5b334f2077e7788de4c21ab2d241..ed52cde2ba01414d550cd0dabd7737c96e90cc12 100644 (file)
--- a/queue-5.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
+++ b/queue-5.4/dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/md/dm-snap.c
 +++ b/drivers/md/dm-snap.c
-@@ -1407,6 +1407,7 @@ static int snapshot_ctr(struct dm_target
+@@ -1408,6 +1408,7 @@ static int snapshot_ctr(struct dm_target
  
        if (!s->store->chunk_size) {
                ti->error = "Chunk size not set";

diff --git a/queue-5.4/series b/queue-5.4/series
index 3b98ccff963dfdb7f1b56bb0ad397eb15ff9fc89..bf455ef738726eb12f9f5faf74008bdecb4cf262 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -39,7 +39,6 @@ drm-amdgpu-update-gc-golden-setting-for-navi12.patch
 drm-amdgpu-update-sdma-golden-setting-for-navi12.patch
 mmc-sdhci-pci-gli-increase-1.8v-regulator-wait.patch
 xen-pciback-reconfigure-also-from-backend-watch-handler.patch
-dm-snapshot-fix-a-crash-when-an-origin-has-no-snapshots.patch
 dm-snapshot-fix-crash-with-transient-storage-and-zero-chunk-size.patch
 revert-video-hgafb-fix-potential-null-pointer-dereference.patch
 revert-net-stmicro-fix-a-missing-check-of-clk_prepare.patch