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 A373B16F831; Fri, 29 Mar 2024 12:34:23 +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=1711715663; cv=none; b=kNKmYBAWZq5iGtySsAehOZPTkQF8byXhMB0QP1GAZOQBuEKh7OVki7ubSqrhdRUdD0JWZUkTp6OJjaB5574eLrMogeZdVUNI/vrAnZ/5UX8Kgd8SXFGkej5KY0CvK0njSGrVdXKaaGC3wNi3HbMI/oDVRxNVCgTa3Dcg1YcYsao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715663; c=relaxed/simple; bh=XkMSNJUMOTJuZGUL+5hhs5kGZDVM5ajOrVYbFeTufcw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UBStQCbUFhFUE30VEDJVfQPJTB0cfT/8lHYuK71vNKnhijpeUtsnS9BUXfNyT8oj8PFv8tHOTQcMg2itKKpyCrt7AggU+pLoSNCF6PnufC70+JuLAv5uTHAwLYjsZdBZh9UnWqZ0DUbo6y0bRdgsIk0tnOrYyq/7NDJ9d9Cxzb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lbpqi4I4; 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="lbpqi4I4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B7CFC43390; Fri, 29 Mar 2024 12:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715663; bh=XkMSNJUMOTJuZGUL+5hhs5kGZDVM5ajOrVYbFeTufcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lbpqi4I4IJZ0aCm+LD33d3QA8id/PZprlL1PBuwx4VWIeX4AVjZ1xgh2RuiKQOTx6 YTzWOoSGBklIKjpv+XW2Zx+4yt52duLMGwtKxhxMlzbA1cYfC1FvuHOi4ZNH9ueSFw iQpnzIBHLtFTGCfKUp/wmeeh1ZxLemqgTrSsehyQ2Lg0F623paPPh7je5KG4Z57Zn5 OArjdzpADBT8rfhVays9y9Gm3rT3XuX28AbTTe1HgLkHiBk/3oETp14Sc6CymiLKxM NuUcmBVwodHUQdtRT90NGrsUidCJCtMXRwfqQTLTrKQ96f64EThzUp5gEt8lyceO1m TvWB1iZAkFDmg== 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 5.10 09/17] pstore/zone: Add a null pointer check to the psz_kmsg_read Date: Fri, 29 Mar 2024 08:33:48 -0400 Message-ID: <20240329123405.3086155-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123405.3086155-1-sashal@kernel.org> References: <20240329123405.3086155-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 5.10.214 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 b50fc33f2ab29..2426fb6794fd3 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