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 D13B915B987; Fri, 29 Mar 2024 12:32:41 +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=1711715561; cv=none; b=d3Ni1wdrrggUU36tpq5KbWu98Gym5hfnUK6Otph1dg+LrpeOACG0Y/IVn/NOdP1V8Uqct0z1j3w8AG++oW+YQy+qoc21yrSaH+iWYrgykZX9qbc6r8Jef6zDb1ZDQvGa5Ex3zS7ulZjoeuyJduh6kkZAwXnpa/2DeKmna9GhwIY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715561; c=relaxed/simple; bh=tPEViQjo1qr7FojiB4E3SuTTfzc9SXQ7WNdOd9cbvoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWrSpCatSFY/G2KZkr2vEX9+s13W4635Oiu9rUPuC+ZWIVbOec5e3W64Q41HZ6ozLkemzTw1mWoXVkhg8E6jBwtaL5UmrBIkzkAmPXWvX0o1Kbi/Em0b57+ozqGbCczfesD/U9+cgWdjmmlhdLfY2k4HDTmc/EU5EomFbP8XEog= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tTXwI5cw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tTXwI5cw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F22D9C43399; Fri, 29 Mar 2024 12:32:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715561; bh=tPEViQjo1qr7FojiB4E3SuTTfzc9SXQ7WNdOd9cbvoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tTXwI5cwRqHN/lWq6Cd9TnyGjp7H6PAjTFcml10sxXfNXEGL7vRcT+ulsogyzSACb jksvIykyXEJMy2WNwczW8+Z7W+OP9su1q5zo3HoziQLHGhZO7QLjoqhEOCrUkC7+oe iNRoqogwTmGqv2Rp2I6aWR/4QJenvSizAYAeiBiP4B56+cvBDQF22W7doHN6TY1rBa wqHNZNkUcj+lTUlh2cJkXSuHrG8ZcVW87ae5X+i9oArJERJuGz4NACebOQW1fDNiPw 7D9pNZBQJVD9Bs+/E0cuc/EYV0dwaO0ggA5fLG4h6qJnqX3CV0Zfj798vw1OxFrNh5 mXJgPBUuuUyWQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kunwu Chan , Kees Cook , Sasha Levin , linux-hardening@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 16/31] pstore/zone: Add a null pointer check to the psz_kmsg_read Date: Fri, 29 Mar 2024 08:31:35 -0400 Message-ID: <20240329123207.3085013-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123207.3085013-1-sashal@kernel.org> References: <20240329123207.3085013-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.83 Content-Transfer-Encoding: 8bit From: Kunwu Chan [ Upstream commit 98bc7e26e14fbb26a6abf97603d59532475e97f8 ] kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Ensure the allocation was successful by checking the pointer validity. Signed-off-by: Kunwu Chan Link: https://lore.kernel.org/r/20240118100206.213928-1-chentao@kylinos.cn Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- fs/pstore/zone.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c index 2770746bb7aa1..abca117725c81 100644 --- a/fs/pstore/zone.c +++ b/fs/pstore/zone.c @@ -973,6 +973,8 @@ static ssize_t psz_kmsg_read(struct pstore_zone *zone, char *buf = kasprintf(GFP_KERNEL, "%s: Total %d times\n", kmsg_dump_reason_str(record->reason), record->count); + if (!buf) + return -ENOMEM; hlen = strlen(buf); record->buf = krealloc(buf, hlen + size, GFP_KERNEL); if (!record->buf) { -- 2.43.0