public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] block: fix an error code in add_partition()
@ 2017-05-23 14:28 Dan Carpenter
  2017-05-23 14:42 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2017-05-23 14:28 UTC (permalink / raw)
  To: Jens Axboe, Will Drewry; +Cc: linux-block, kernel-janitors

We don't set an error code on this path.  It means that we return NULL
instead of an error pointer and the caller does a NULL dereference.

Fixes: 6d1d8050b4bc ("block, partition: add partition_meta_info to hd_struct")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/block/partition-generic.c b/block/partition-generic.c
index ff07b9143ca4..c5ec8246e25e 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -320,8 +320,10 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
 
 	if (info) {
 		struct partition_meta_info *pinfo = alloc_part_info(disk);
-		if (!pinfo)
+		if (!pinfo) {
+			err = -ENOMEM;
 			goto out_free_stats;
+		}
 		memcpy(pinfo, info, sizeof(*info));
 		p->info = pinfo;
 	}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] block: fix an error code in add_partition()
  2017-05-23 14:28 [PATCH] block: fix an error code in add_partition() Dan Carpenter
@ 2017-05-23 14:42 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2017-05-23 14:42 UTC (permalink / raw)
  To: Dan Carpenter, Will Drewry; +Cc: linux-block, kernel-janitors

On 05/23/2017 08:28 AM, Dan Carpenter wrote:
> We don't set an error code on this path.  It means that we return NULL
> instead of an error pointer and the caller does a NULL dereference.

Thanks Dan, applied.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-05-23 14:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-23 14:28 [PATCH] block: fix an error code in add_partition() Dan Carpenter
2017-05-23 14:42 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox