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 X-Spam-Level: X-Spam-Status: No, score=-14.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47E10C433E1 for ; Sat, 22 Aug 2020 13:39:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2874F2078D for ; Sat, 22 Aug 2020 13:39:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="eZWc7ut0"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jp9ZGybj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728153AbgHVNj2 (ORCPT ); Sat, 22 Aug 2020 09:39:28 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:33776 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728072AbgHVNjD (ORCPT ); Sat, 22 Aug 2020 09:39:03 -0400 Date: Sat, 22 Aug 2020 13:39:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1598103540; 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=sCEkJx8t5gzQnXF0Oa3zM4Cg7Tuy/+WoChgi1OWUv1M=; b=eZWc7ut0zIOyDWbl1u4dmbn8CEfmdKo3rY/Xmz1P0O1bAWxRFP9KKa7FWkdfmkDuJNYhEm RSPdhh2jQP46UPl/8DkvXwHSRDlgg4PBZMbfIxoIDoo2dZ6hw+nCVxi2vpGrTu9bQuKYYu mICpqKnf+Vxbl9/pxcIpB9k0cRlPmbGA50i1dIkXhe4nf834efPUlmC5DfcFOSsZeCzDSe tAG/nCVRLdqk2nKL9EDO7RNMWq3yjWAmTZsRqeMNuInkvTdND1IAsRD4qSQwlcLUnbQdvx zOQ0T3ix3jyZuVTGH8oSaPNLYEOukoHM6SEXNEMMmPhubZzIlARoBfw+kXiRUg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1598103540; 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=sCEkJx8t5gzQnXF0Oa3zM4Cg7Tuy/+WoChgi1OWUv1M=; b=jp9ZGybj91lkev0EgDqgiB+r/iTAI1fDBdOpMvsM+ARD/zhztqur4MQirY0NP5E/z2CSu3 RknDDidMXoYRG0AA== From: "tip-bot2 for Arvind Sankar" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: efi/urgent] efi/libstub: Stop parsing arguments at "--" Cc: , Arvind Sankar , Ard Biesheuvel , x86 , LKML In-Reply-To: <20200725155916.1376773-1-nivedita@alum.mit.edu> References: <20200725155916.1376773-1-nivedita@alum.mit.edu> MIME-Version: 1.0 Message-ID: <159810354014.3192.667815415521624242.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the efi/urgent branch of tip: Commit-ID: 1fd9717d75df68e3c3509b8e7b1138ca63472f88 Gitweb: https://git.kernel.org/tip/1fd9717d75df68e3c3509b8e7b1138ca63472f88 Author: Arvind Sankar AuthorDate: Sat, 25 Jul 2020 11:59:16 -04:00 Committer: Ard Biesheuvel CommitterDate: Thu, 20 Aug 2020 11:18:52 +02:00 efi/libstub: Stop parsing arguments at "--" Arguments after "--" are arguments for init, not for the kernel. Cc: Signed-off-by: Arvind Sankar Link: https://lore.kernel.org/r/20200725155916.1376773-1-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/efi-stub-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index 6bca70b..37ff34e 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -201,6 +201,8 @@ efi_status_t efi_parse_options(char const *cmdline) char *param, *val; str = next_arg(str, ¶m, &val); + if (!val && !strcmp(param, "--")) + break; if (!strcmp(param, "nokaslr")) { efi_nokaslr = true;