From patchwork Wed Oct 16 21:50:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 176533 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp58554ill; Wed, 16 Oct 2019 15:15:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLZFEkKRIqHDSax16O7xAcymPaNbTQB92/VNihCBXZmAZCUGotpbA6E+N8TfuLO+MwD3zB X-Received: by 2002:a17:906:c317:: with SMTP id s23mr574169ejz.251.1571264151062; Wed, 16 Oct 2019 15:15:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571264151; cv=none; d=google.com; s=arc-20160816; b=jxdkyd1wecOXVLYGKNq7lJ9q8OHm1qGYHkmJHcWnkzz2VCJeeKqW9HbtLYSS0gfxCR jG9dWW2pEdJP95corlZutTHlG/ZCvdaLQN4ZAxrjyvyYbXhkVCzU+eYZVNJMRMdLEm6m 6k0DohRx+xkdHw20NUSAXYRZK5DF9RFxzUFNwbUYBUea4p4DiuDCJ1UCbZKY8v+OA9TP WsYHimWI3hePVvc0ZfZw6aHwwZYjaeFvPfWsjpCXXQfeJjfCbcrSQjgDA4iD9kRS16oM v0x+WiZA1ECzYI+oEYZ1kc0npMPT+AWt0q7ONGeqGyyzOB2psB4UOrkag2QPfp069cpq Za5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CIqK9vjiVfFjX6rgYnDi1O7kkZz7xeTkxncLYa+ky2Y=; b=OQWBPoyXh90GvBsOw4bXNhUNuPOUpsbul4fJ6kJ2XhORaUdavDGD4Hu4jdaC5K6v8q VrzqSEpuGrdpKRVw+ahTowjuXpMwCxfstbzfBfCdKBHnqQH+iIeqY1HluBHy6pJ7gP1O 71dTMc8zL5BrfQskszfyRTdMXNL5/Yzfc0iy1diV37kkBjvwoZ0MkpPR4o7uYyTxsbX/ fNZKvuZkMDMcyZgrXBj9/6/UCKO//tvWklNFVx43+fYhVEpuQC9bVDNqJJB2GNKp2rlH vI+DChXAhRCWN8cM/J4mucaAVYWYjGIm2neOpYRdgzWkXy2b7/nJqWHCPpSsErqOPZpi rCPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aVhWrnas; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n3si268693edc.151.2019.10.16.15.15.50; Wed, 16 Oct 2019 15:15:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aVhWrnas; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437784AbfJPVzV (ORCPT + 26 others); Wed, 16 Oct 2019 17:55:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:45762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437748AbfJPVzR (ORCPT ); Wed, 16 Oct 2019 17:55:17 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C7D1218DE; Wed, 16 Oct 2019 21:55:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262916; bh=61zl7DkTaWrXCdCD6qktASwL8w1xwvcJ3Y+nDn38yoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVhWrnaswqTQjQsdIPP8LDcoErM56dPS7JJVgIaJe6Lruq7znAHVpleEF+Ym3Q1Tm ANX13YnlPo9gQJsCylwxGolX1gQDUSYme47GcXNEHuukGCr2lKpBukq2gZQafzH+wk EXWWEiCbqjPjoOKYOFAOb/mhJqntphH50K4bxtXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Talbert , Ard Biesheuvel , Ben Dooks , Dave Young , Jarkko Sakkinen , Jerry Snitselaar , Linus Torvalds , Lukas Wunner , Lyude Paul , Matthew Garrett , Octavian Purdila , Peter Jones , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, linux-integrity@vger.kernel.org, Ingo Molnar Subject: [PATCH 4.9 76/92] efivar/ssdt: Dont iterate over EFI vars if no SSDT override was specified Date: Wed, 16 Oct 2019 14:50:49 -0700 Message-Id: <20191016214845.951472119@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel commit c05f8f92b701576b615f30aac31fabdc0648649b upstream. The kernel command line option efivar_ssdt= allows the name to be specified of an EFI variable containing an ACPI SSDT table that should be loaded into memory by the OS, and treated as if it was provided by the firmware. Currently, that code will always iterate over the EFI variables and compare each name with the provided name, even if the command line option wasn't set to begin with. So bail early when no variable name was provided. This works around a boot regression on the 2012 Mac Pro, as reported by Scott. Tested-by: Scott Talbert Signed-off-by: Ard Biesheuvel Cc: # v4.9+ Cc: Ben Dooks Cc: Dave Young Cc: Jarkko Sakkinen Cc: Jerry Snitselaar Cc: Linus Torvalds Cc: Lukas Wunner Cc: Lyude Paul Cc: Matthew Garrett Cc: Octavian Purdila Cc: Peter Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Cc: linux-integrity@vger.kernel.org Fixes: 475fb4e8b2f4 ("efi / ACPI: load SSTDs from EFI variables") Link: https://lkml.kernel.org/r/20191002165904.8819-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/efi.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -243,6 +243,9 @@ static __init int efivar_ssdt_load(void) void *data; int ret; + if (!efivar_ssdt[0]) + return 0; + ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries); list_for_each_entry_safe(entry, aux, &entries, list) {