From 2c134019d969bf39d44b9e82309e4d1f69b5f370 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 26 Aug 2019 15:26:35 -0400 Subject: [PATCH] fixes for 4.14 Signed-off-by: Sasha Levin --- ...ential-null-dereference-in-dmz_do_re.patch | 45 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 queue-4.14/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch diff --git a/queue-4.14/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch b/queue-4.14/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch new file mode 100644 index 00000000000..13633866bf1 --- /dev/null +++ b/queue-4.14/dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch @@ -0,0 +1,45 @@ +From b241e84b8353b92545472fa66da57a4ae3b51256 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +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 +Reviewed-by: Dmitry Fomichev +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + 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 ccf17eb6adaa2..b322821a6323b 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.14/series b/queue-4.14/series index 41eba2ba919..669671ebdd3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -58,3 +58,4 @@ mm-page_owner-handle-thp-splits-correctly.patch mm-zsmalloc.c-migration-can-leave-pages-in-zs_empty-indefinitely.patch mm-zsmalloc.c-fix-race-condition-in-zs_destroy_pool.patch xfs-fix-missing-ilock-unlock-when-xfs_setattr_nonsize-fails-due-to-edquot.patch +dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch -- 2.47.3