From patchwork Wed Oct 18 10:34:16 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: 154798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4694411vqb; Wed, 18 Oct 2023 03:34:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEINxjfUsdchEI2b9EKYm/Ki4FzS/T8lPunRDgksUUzxnkcMVYZqpsylSVVhD1nptd6qNq X-Received: by 2002:a17:90b:3148:b0:27d:9b6:ec1b with SMTP id ip8-20020a17090b314800b0027d09b6ec1bmr5040811pjb.4.1697625285150; Wed, 18 Oct 2023 03:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697625285; cv=none; d=google.com; s=arc-20160816; b=RrCC4JcbdGtMtoYz5f5R1l3THTUG9//EVkUSi6MQYLyGfvDO0El/l17LWU6it8II4X IKHbXYGntT4c0MapEysVPA7knvRJRjm6tTRGeVsDiA6RTPgUS3NULInTkJlKHb59NdCO oMm1h6GJXXgS+qmlQX1+C5mNmXT0ogfGdL/2Ou/D+RBbZl+f0YhYj1dO/gWmRFnX5qqn OcF/oW64nKcPvzje6arpzmrxCPrvKndsaF5honbVxPQn6dVh13Du1j3tsZMJ23eNCi4f FK0KiFFdvwXd64oorJ0ycLC6HAJVRza3Js2y+7Jz6dcj5kPx9PfcEnHFBqHVdZRIaXTw 7K+w== 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:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=zAT0k8uV4B1VaziPHHllpGl9vbj2hwXI5RmgJXRf8gY=; fh=h7QKJwYA20VaFYA/2zp9Z0T8zdbjUKGwUTxE/B3PUEY=; b=UQReCSQ4aHfd6FBL71Dm/hW5Cpf6+M7WmP/a/ushjhk2aBNmSf2uRovv2jtl5srK5n SN44TJejDSsz1jO7udTBROFJIbBQRoh2eWkCTqF3wbBDMIGA2lk1PSgTrDShsmKGwnwU gw5b1FrfusafxpL2sIvBrerYlzWrrl+jX+FSWg9Wqzf61QYIt2gx5ElPQcUuZ5tTRnfj mzt0Po5fOY88N2ZVor8F+IBL+MC555AQGLJN4LYGvzRYSQCipzIhvvCLILWV+Sgqb/t4 XClVu2UKYKuPJYY86AbYWFrL/GiyhlDtmaVogut85UNGtpkYsOGkFea8xXxzdlgTNRTc 8ztw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tyme8N1w; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id e8-20020a17090a804800b00277624ffa82si1250126pjw.86.2023.10.18.03.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 03:34:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tyme8N1w; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id AF2C180BA66B; Wed, 18 Oct 2023 03:34:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230428AbjJRKeX (ORCPT + 24 others); Wed, 18 Oct 2023 06:34:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229690AbjJRKeV (ORCPT ); Wed, 18 Oct 2023 06:34:21 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDE69BA; Wed, 18 Oct 2023 03:34:19 -0700 (PDT) Date: Wed, 18 Oct 2023 10:34:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697625257; 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; bh=zAT0k8uV4B1VaziPHHllpGl9vbj2hwXI5RmgJXRf8gY=; b=tyme8N1wKOL3zq4Q8j7udJYUK26F4YyEcD5tnwTPqVGIMG/gvj2OhTN66uDEVU67kCXGeE 7lD63wp2IZmNJpHmwPfe1ZxFy90Pa89MyRNzj+VaQX8zir01KCjYd53tedvzZhr3mxUmk9 zUhvTlMs12vfk4GRtI6Z225JE8ew8lWjyRCP0lHhCi7V8U+rLlUGxtSzVQ5We/ZBhi7g8q 4r5cvlR6Dv/RHGWmNNLfuarvRPxvY8qUuRgEV8OIfaQB5wrInu7ZCDeiLp9uuYdI6s3pEh H8PgLfsQJYjnG1ioUCYKcucZ8A1NV5tHTjGqyzSQ52Kv/FGO/tZkdF59b551pg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697625257; 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; bh=zAT0k8uV4B1VaziPHHllpGl9vbj2hwXI5RmgJXRf8gY=; b=98KCdelaADEX8bKHz5g+ChhpEdc4r/X7v+YEEgFlRQdRRKFc4BMN1cTAMHG5O/oqPjn8fz 1E8/i4BbcRxerTBQ== From: "tip-bot2 for Ard Biesheuvel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: efistub: Assign global boot_params variable Cc: Ard Biesheuvel , Ingo Molnar , linux-kernel@vger.kernel.org, x86@kernel.org MIME-Version: 1.0 Message-ID: <169762525684.3135.6443175198415541833.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 18 Oct 2023 03:34:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780089130989528166 X-GMAIL-MSGID: 1780089130989528166 The following commit has been merged into the x86/boot branch of tip: Commit-ID: 50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52 Gitweb: https://git.kernel.org/tip/50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52 Author: Ard Biesheuvel AuthorDate: Tue, 17 Oct 2023 15:25:13 +02:00 Committer: Ingo Molnar CommitterDate: Wed, 18 Oct 2023 12:03:04 +02:00 x86/boot: efistub: Assign global boot_params variable Now that the x86 EFI stub calls into some APIs exposed by the decompressor (e.g., kaslr_get_random_long()), it is necessary to ensure that the global boot_params variable is set correctly before doing so. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Cc: linux-kernel@vger.kernel.org --- drivers/firmware/efi/libstub/x86-stub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index 3bfc596..76cc0d0 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -818,6 +818,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle, unsigned long kernel_entry; efi_status_t status; + boot_params_ptr = boot_params; + efi_system_table = sys_table_arg; /* Check if we were booted by the EFI firmware */ if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)