From patchwork Thu Mar 16 13:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 70799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp492933wrt; Thu, 16 Mar 2023 06:50:58 -0700 (PDT) X-Google-Smtp-Source: AK7set8m5BclkfrdYTEbiGtRxJCf7b9GLHLFKfv7D8CFCPqQ+DkeD/iADJbBI5sinfz0jHwSK8VQ X-Received: by 2002:aa7:9849:0:b0:624:3f2f:4a42 with SMTP id n9-20020aa79849000000b006243f2f4a42mr3007227pfq.3.1678974658487; Thu, 16 Mar 2023 06:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678974658; cv=none; d=google.com; s=arc-20160816; b=QGln/K0vDzUMecuBItkUynFvao3wY+Hk9c+8OxtNi+JsPOWVmvMKGHR/BREl1QKOyK jLHAs7ylRwJITvQ43xBlbfhi8XPw1iz60no8KAKO+TzijHaG/aOHoMMsFH1DG//tJXRc +WaLxlgJiVuei+EhBjgbnVE5CAt+V1W09m2jxw0eshy2tecrn80uW6P2V3M91bK8Aa5o WHbyOUcbacu2fsn5xmuFVRDN+GJhEuFIvDBsI67zECdVghusNS6VxgNhr2O7geWWV5P/ fND3Z7PlZqwBYZ7aG+PenbkOqp5/2oWaZmIvlC3BIVB87WeDghxNv46PNhIOiy5HF9Kc NiWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=OFyaFDPEPaIsBCnzx7br38Ux0Nge11G84LMEMFd9lFg=; b=FSsZPGLtsp5KG7sPYXMH4XX0mAInTQEjnMkaEwK5f1wadKHc4F4zwaRSWMTHdhiyNa Do6iZ/FO8rLRenskGYx75Ejii5g2UzU4H0v2V1ECo93Nl4SqKPO1gLPq9wemxe7PzSvj aio8A7C3sSwPge8jb40k8vL1B4PZ/wSYTsLUCM7JeY4Q5ZlRX9utb/r9G1RO4fW2v5M/ wAjAcO/EtctHg5X49JqgfTjYj14KDfcMnwQsjFqMwW6Fo0bnswc7HUJaf1+lWMcm8+oK h3/MX8GDYVFjudHXRVAdt5DbLYNT/RjktbJIGF2Yl+huyh9ZOOcv+Cl2i41JwqCi08iW B4QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=APG7eYFs; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v10-20020a63bf0a000000b0050bed6344f6si2506549pgf.841.2023.03.16.06.50.43; Thu, 16 Mar 2023 06:50:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=APG7eYFs; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230413AbjCPNqC (ORCPT + 99 others); Thu, 16 Mar 2023 09:46:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230398AbjCPNpr (ORCPT ); Thu, 16 Mar 2023 09:45:47 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82E7CA17C9; Thu, 16 Mar 2023 06:45:36 -0700 (PDT) Date: Thu, 16 Mar 2023 13:45:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1678974334; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OFyaFDPEPaIsBCnzx7br38Ux0Nge11G84LMEMFd9lFg=; b=APG7eYFsvkLa17FbQXLBkWCWsXBE6CmKSm71TeKkIC2z2EQneH3HnS0bYCShZGaq/XQSbo qKGrgAp+S7yO9NN2k+7/2tAzebNykYk05ctJoetA732ePXvy6n0m0aEWWBlmhdSQG6K/qj pLElFEQnzfS5OS9Hes+WHgtYTJLNHMxDsPBTXeegE9MDfGrH+71t2u7bAuYFr7s+71kYIz e/IKQbSgSLM7bLchNG6F4uJQfGXlLlCrHvhotb5Byfm44iHutTRUtePUVZztA1buZ8gn3P 7R2oAnG1rK0nZ9B7QsDybUhgqid7y+COqvgdSWCBntV6NCIdESsOsizucmiKfQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1678974334; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OFyaFDPEPaIsBCnzx7br38Ux0Nge11G84LMEMFd9lFg=; b=EizeFONJGqpwHaWH5R1Z8GM48q/B9DeBRex6t6u4JYaj3jkN0//iCuKjOQ4Cq4cFSErUlM xVOV1Njr6EmlioBA== From: "tip-bot2 for Nikita Zhandarovich" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/mm: Fix use of uninitialized buffer in sme_enable() Cc: Nikita Zhandarovich , "Borislav Petkov (AMD)" , Tom Lendacky , , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230306160656.14844-1-n.zhandarovich@fintech.ru> References: <20230306160656.14844-1-n.zhandarovich@fintech.ru> MIME-Version: 1.0 Message-ID: <167897433346.5837.2554151062062268699.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759640252055937182?= X-GMAIL-MSGID: =?utf-8?q?1760532531135750881?= The following commit has been merged into the x86/urgent branch of tip: Commit-ID: cbebd68f59f03633469f3ecf9bea99cd6cce3854 Gitweb: https://git.kernel.org/tip/cbebd68f59f03633469f3ecf9bea99cd6cce3854 Author: Nikita Zhandarovich AuthorDate: Mon, 06 Mar 2023 08:06:56 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 16 Mar 2023 12:22:25 +01:00 x86/mm: Fix use of uninitialized buffer in sme_enable() cmdline_find_option() may fail before doing any initialization of the buffer array. This may lead to unpredictable results when the same buffer is used later in calls to strncmp() function. Fix the issue by returning early if cmdline_find_option() returns an error. Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE. Fixes: aca20d546214 ("x86/mm: Add support to make use of Secure Memory Encryption") Signed-off-by: Nikita Zhandarovich Signed-off-by: Borislav Petkov (AMD) Acked-by: Tom Lendacky Cc: Link: https://lore.kernel.org/r/20230306160656.14844-1-n.zhandarovich@fintech.ru --- arch/x86/mm/mem_encrypt_identity.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c index 88cccd6..c6efcf5 100644 --- a/arch/x86/mm/mem_encrypt_identity.c +++ b/arch/x86/mm/mem_encrypt_identity.c @@ -600,7 +600,8 @@ void __init sme_enable(struct boot_params *bp) cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr | ((u64)bp->ext_cmd_line_ptr << 32)); - cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)); + if (cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)) < 0) + return; if (!strncmp(buffer, cmdline_on, sizeof(buffer))) sme_me_mask = me_mask;