From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E29802BAF9; Wed, 2 Oct 2024 13:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877553; cv=none; b=qrg8PlTgf4wZS4ShiCuYxWomNGaOFNb3XSJUMTSglRvlX8zekeRPmzpcchcGcrHftDtpfkhF9p3xGWqhYsz2pDIPiSN7UHZv7e4cl8lo4nD7UJvlkd/3vzhS1dw8Zg0HLiH2qKWY4P+5IJFokO4iyUxLICV74O4W7Pay85tDP4M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877553; c=relaxed/simple; bh=CXrOykS0jJ03LGSDvTiZCkfdzUn1slgvaSSB8OYaGdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kBCgL1ATNUuNrB/mdweyfm0Y0kM51i3Qn5bYtfwDRlmCb8HRoR+x4BJFog/2lh9akN+DJvtmkxrQyQnb1cHzgO9zqKHMGu2y9u1z1sLZBv8NhRRoJPNkEZjvoovq8crIGbYShbivm3++Br209ioGpIBA0Ik0cfCh8Qk2GGwINS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=afeZqJry; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="afeZqJry" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60803C4CED4; Wed, 2 Oct 2024 13:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727877552; bh=CXrOykS0jJ03LGSDvTiZCkfdzUn1slgvaSSB8OYaGdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=afeZqJryjQHp5uEk3/c0kYJX50QxatUoLHV+oifqvtwBCrZTvj/fJ+UngNwa5SO3g lJS9SORm057ZXKZnBkW9L19Ey3mko8CClqOqPJwrC6a5F72+QZ8/N2+jGo4WyMywQK 8LsvpKgLeUOobx+dYgIiHPbXijQjHNpcBzNuYuvE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Riyan Dhiman , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 6.10 116/634] block: fix potential invalid pointer dereference in blk_add_partition Date: Wed, 2 Oct 2024 14:53:36 +0200 Message-ID: <20241002125815.691270163@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Riyan Dhiman [ Upstream commit 26e197b7f9240a4ac301dd0ad520c0c697c2ea7d ] The blk_add_partition() function initially used a single if-condition (IS_ERR(part)) to check for errors when adding a partition. This was modified to handle the specific case of -ENXIO separately, allowing the function to proceed without logging the error in this case. However, this change unintentionally left a path where md_autodetect_dev() could be called without confirming that part is a valid pointer. This commit separates the error handling logic by splitting the initial if-condition, improving code readability and handling specific error scenarios explicitly. The function now distinguishes the general error case from -ENXIO without altering the existing behavior of md_autodetect_dev() calls. Fixes: b72053072c0b (block: allow partitions on host aware zone devices) Signed-off-by: Riyan Dhiman Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20240911132954.5874-1-riyandhiman14@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/partitions/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/partitions/core.c b/block/partitions/core.c index ab76e64f0f6c3..5bd7a603092ea 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -555,9 +555,11 @@ static bool blk_add_partition(struct gendisk *disk, part = add_partition(disk, p, from, size, state->parts[p].flags, &state->parts[p].info); - if (IS_ERR(part) && PTR_ERR(part) != -ENXIO) { - printk(KERN_ERR " %s: p%d could not be added: %pe\n", - disk->disk_name, p, part); + if (IS_ERR(part)) { + if (PTR_ERR(part) != -ENXIO) { + printk(KERN_ERR " %s: p%d could not be added: %pe\n", + disk->disk_name, p, part); + } return true; } -- 2.43.0