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 597A547A7C; Wed, 21 Feb 2024 14:00:48 +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=1708524048; cv=none; b=dmEaMeH4/4ikBOexdP4h0Ub2yDzxa71V3DstX0RctY4V4an4Ylh8GPBmUKRgOPB1jwvq3MCES/aYM6havKCN9Aad5uzTMTlwGRk5aGntBezXisoM5KHhRBkw5Fr4EO05L8uQsYoCjMHsxhesX2R33z/OqIXfF1f/PVQu8njBoIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708524048; c=relaxed/simple; bh=xwhf78L8WipF7xC19n85hhMcQPXkZKO2JsjpPLouN0U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sb+2tEs9vcIOSrtxOe4i3wFJH6CHxrPkng1XHEYifDp8nJMa+o2XRDfNfgH+5YH0vek3MZm1p2z6zxXBC05aQszjUNH551gFMjt5M2eOYeAtWRbz5HVnt4EiNlPb5BLaLUBKqlPfJczEyZSP+h3BJDJuWhYdjr0QO3W2pPVQCS8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rTRCh17q; 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="rTRCh17q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD696C433C7; Wed, 21 Feb 2024 14:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708524048; bh=xwhf78L8WipF7xC19n85hhMcQPXkZKO2JsjpPLouN0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rTRCh17q8M+h+eZJ/nsPLBg75FoLE+FPCTL4cUl66w1Uxl4J8hBrFrfD/uIWG6KPb j3Nb1x7B6kXm9p2HGDY8A2QnftAlKCtYGh8eOfkq3yWLYRe+fpFYMifH4fyHWuRiIW xdSBjbqZV87g4j6UG7EjV0U1hMtUKdnuvSyvNqMA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe Leroy , Michael Ellerman , Kunwu Chan , Sasha Levin Subject: [PATCH 5.10 101/379] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add Date: Wed, 21 Feb 2024 14:04:40 +0100 Message-ID: <20240221125957.908818881@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221125954.917878865@linuxfoundation.org> References: <20240221125954.917878865@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kunwu Chan [ Upstream commit f46c8a75263f97bda13c739ba1c90aced0d3b071 ] kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Ensure the allocation was successful by checking the pointer validity. Suggested-by: Christophe Leroy Suggested-by: Michael Ellerman Signed-off-by: Kunwu Chan Signed-off-by: Michael Ellerman Link: https://msgid.link/20231204023223.2447523-1-chentao@kylinos.cn Signed-off-by: Sasha Levin --- arch/powerpc/mm/init-common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c index 8e0d792ac296..52a20c97e46e 100644 --- a/arch/powerpc/mm/init-common.c +++ b/arch/powerpc/mm/init-common.c @@ -111,7 +111,7 @@ void pgtable_cache_add(unsigned int shift) * as to leave enough 0 bits in the address to contain it. */ unsigned long minalign = max(MAX_PGTABLE_INDEX_SIZE + 1, HUGEPD_SHIFT_MASK + 1); - struct kmem_cache *new; + struct kmem_cache *new = NULL; /* It would be nice if this was a BUILD_BUG_ON(), but at the * moment, gcc doesn't seem to recognize is_power_of_2 as a @@ -124,7 +124,8 @@ void pgtable_cache_add(unsigned int shift) align = max_t(unsigned long, align, minalign); name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift); - new = kmem_cache_create(name, table_size, align, 0, ctor(shift)); + if (name) + new = kmem_cache_create(name, table_size, align, 0, ctor(shift)); if (!new) panic("Could not allocate pgtable cache for order %d", shift); -- 2.43.0