fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch b/queue-4.19/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch
new file mode 100644 (file)
index 0000000..5705cd8
--- /dev/null
+++ b/queue-4.19/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch
@@ -0,0 +1,45 @@
+From 55db3f41dbb503481d78a11df445fb0790ffabb6 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Mon, 19 Aug 2019 12:58:14 +0300
+Subject: dm zoned: fix potential NULL dereference in dmz_do_reclaim()
+
+[ Upstream commit e0702d90b79d430b0ccc276ead4f88440bb51352 ]
+
+This function is supposed to return error pointers so it matches the
+dmz_get_rnd_zone_for_reclaim() function.  The current code could lead to
+a NULL dereference in dmz_do_reclaim()
+
+Fixes: b234c6d7a703 ("dm zoned: improve error handling in reclaim")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
+Signed-off-by: Mike Snitzer <snitzer@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/md/dm-zoned-metadata.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
+index 00e7a343eacf1..7e8d7fc99410d 100644
+--- a/drivers/md/dm-zoned-metadata.c
++++ b/drivers/md/dm-zoned-metadata.c
+@@ -1579,7 +1579,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
+       struct dm_zone *zone;
+ 
+       if (list_empty(&zmd->map_seq_list))
+-              return NULL;
++              return ERR_PTR(-EBUSY);
+ 
+       list_for_each_entry(zone, &zmd->map_seq_list, link) {
+               if (!zone->bzone)
+@@ -1588,7 +1588,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
+                       return zone;
+       }
+ 
+-      return NULL;
++      return ERR_PTR(-EBUSY);
+ }
+ 
+ /*
+-- 
+2.20.1
+

diff --git a/queue-4.19/series b/queue-4.19/series
index 69bb0ea98ecf7675e3ce31aed81b509054e33478..b5844f9362ebf34c13e60396f263e8dfe6df48bb 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -92,3 +92,4 @@ xfs-add-helper-function-xfs_attr_try_sf_addname.patch
 xfs-add-attibute-set-and-helper-functions.patch
 xfs-add-attibute-remove-and-helper-functions.patch
 xfs-always-rejoin-held-resources-during-defer-roll.patch
+dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch