From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34607C46467 for ; Mon, 16 Jan 2023 16:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233726AbjAPQoS (ORCPT ); Mon, 16 Jan 2023 11:44:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233615AbjAPQn1 (ORCPT ); Mon, 16 Jan 2023 11:43:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 540AD34571 for ; Mon, 16 Jan 2023 08:31:16 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E564661047 for ; Mon, 16 Jan 2023 16:31:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 076B1C433D2; Mon, 16 Jan 2023 16:31:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673886675; bh=Mrgzz4Ow62v7HfHjwdSSv2oj6OasGgS0n0jIyFeV9g4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I86X4QtHsIzE0lbPAbaSeu4bA+VJB56FRZJsXVgSgyllw/TsKHpV1hGbWwFD5J37U k5chr0NqAecXiaD6mG9qV6S6KBWFrBFngCwHiBzEuA56uCG5XK4SA5PoSSn4VtD1QH ReHx7SaZiqSwutHcwbGknKrJNmR6fcMz52FidyUk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Jiaming Li , Huaxin Lu , Stefan Berger , Mimi Zohar Subject: [PATCH 5.4 512/658] ima: Fix a potential NULL pointer access in ima_restore_measurement_list Date: Mon, 16 Jan 2023 16:50:00 +0100 Message-Id: <20230116154932.931586672@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Huaxin Lu commit 11220db412edae8dba58853238f53258268bdb88 upstream. In restore_template_fmt, when kstrdup fails, a non-NULL value will still be returned, which causes a NULL pointer access in template_desc_init_fields. Fixes: c7d09367702e ("ima: support restoring multiple template formats") Cc: stable@kernel.org Co-developed-by: Jiaming Li Signed-off-by: Jiaming Li Signed-off-by: Huaxin Lu Reviewed-by: Stefan Berger Signed-off-by: Mimi Zohar Signed-off-by: Greg Kroah-Hartman --- security/integrity/ima/ima_template.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c @@ -292,8 +292,11 @@ static struct ima_template_desc *restore template_desc->name = ""; template_desc->fmt = kstrdup(template_name, GFP_KERNEL); - if (!template_desc->fmt) + if (!template_desc->fmt) { + kfree(template_desc); + template_desc = NULL; goto out; + } spin_lock(&template_list); list_add_tail_rcu(&template_desc->list, &defined_templates);