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 AAA251BDB9D; Fri, 29 Mar 2024 12:44:44 +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=1711716284; cv=none; b=hUj2dp0x4ITVd85Tp3ItoiVDhlurW00z0B1rGUjWrfthU3uNNL+40u7TnDSU3XULrIXyBRmb/L06z4zUypOGU6mbzc5ztwDlbIRXX1kqssXWk1RoJFpJL8iV5NXVfCpltx6MR0788ISAXZUQWTedSy/WEK5H+8k8aZSDdDZJOOc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716284; c=relaxed/simple; bh=tPEViQjo1qr7FojiB4E3SuTTfzc9SXQ7WNdOd9cbvoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NUht8trtmeaQ1Buq5X0X3Pl7o9uCKAH2tPmWEUEV4TV+0vO9/uObIKcxM57A5hHtum/WKk7I+jkPqzCBJh8NV4GAPs8DG5rQM8Ds0Mka69Hcsz1spLYfDaoEpEAOxYZpcU7XgEPnmI+zv9PHOmZ0ub+X/dUY2vYx7fSQOM0dtKc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q9gu3xBH; 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="Q9gu3xBH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4C86C433C7; Fri, 29 Mar 2024 12:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716284; bh=tPEViQjo1qr7FojiB4E3SuTTfzc9SXQ7WNdOd9cbvoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q9gu3xBHISZkuNquFdnPtpmxMUsQlThNxV9ZT4Q+paVXM+1dft/Xw1nDSzjyDjuGH oyZzKMabz29F2ZkDBYIe/Qu7N7FAsWQLC6gDCaYG0vVuccB6B0TA+WkStIBubR4wzw m7D4DvEeF+jEWmIV7zRmDcS8WVqdAuUChYg5JV1PkibbWyrmL/C5mG3rXf/Z/PEozJ mN89zCz7w60Lt5pcrHK41yi6Tdt/Yu34uqxcg5J5eRPijPGKo0BTeM4HudldOQUzRC SvW3GMI4ATAjQ3JtMKW1VfeBAYj++bTqwNQjH8J6Mh5PZUL5OSXHG8zJTSCoeVCTDd pSywXF4I6UAQQ== 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.6 39/75] pstore/zone: Add a null pointer check to the psz_kmsg_read Date: Fri, 29 Mar 2024 08:42:20 -0400 Message-ID: <20240329124330.3089520-39-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124330.3089520-1-sashal@kernel.org> References: <20240329124330.3089520-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.6.23 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