From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-co1nam03on0094.outbound.protection.outlook.com ([104.47.40.94]:52832 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965084AbeCSQMz (ORCPT ); Mon, 19 Mar 2018 12:12:55 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Dan Carpenter , Jens Axboe , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 040/102] block: fix an error code in add_partition() Date: Mon, 19 Mar 2018 16:12:22 +0000 Message-ID: <20180319161117.17833-40-alexander.levin@microsoft.com> References: <20180319161117.17833-1-alexander.levin@microsoft.com> In-Reply-To: <20180319161117.17833-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Dan Carpenter [ Upstream commit 7bd897cfce1eb373892d35d7f73201b0f9b221c4 ] 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_struc= t") Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/partition-generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/partition-generic.c b/block/partition-generic.c index 0d9e5f97f0a8..94de2055365e 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -309,8 +309,10 @@ struct hd_struct *add_partition(struct gendisk *disk, = int partno, =20 if (info) { struct partition_meta_info *pinfo =3D alloc_part_info(disk); - if (!pinfo) + if (!pinfo) { + err =3D -ENOMEM; goto out_free_stats; + } memcpy(pinfo, info, sizeof(*info)); p->info =3D pinfo; } --=20 2.14.1