Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp4527112imb; Wed, 6 Mar 2019 16:01:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzojBv0k+TNZ4T+J7c2Bim+qKPGvsdJtTcrNlGumTqhF8p/eTmtHiht4HZkr+heCWpcEFnJ X-Received: by 2002:a62:8384:: with SMTP id h126mr9791191pfe.243.1551916878172; Wed, 06 Mar 2019 16:01:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551916878; cv=none; d=google.com; s=arc-20160816; b=DdLj7cjEavfDhZl03poqMbkhiBVqMxjZA6J115kSRDdDffOgibtDfYda0kTfybopJ4 lAPiKpIPu6dQrCht0WCSaNPGuLxLYWiXlEX17FIjzqQ0wa4Pwuv7gvGJzgZz7GTbEvWB nLsoEZBvnAQ/VpptMt0wU6lLK4zi8JXxjwPu+PO/UTlISS8K5f9jjB03I+ic4bYMlfX2 8S5G1ifC5fPbjtae/gW3NlIAapnD3wK184SFFOEDN5oYI5Xf5fsUSawc4hMr1qIJM5cu rCJEwpbUldXX6WrLP10VJXrkRu3sBSWmkR83tuEeiy0JTKNk0MrhkSj5V9IIuoofOOV7 c9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=PqjENvzleKHq5r7VnPhuqFw2a2C+H2yOqXdiGG7oaFo=; b=OZ4X0P3Q5BpiJlbmZ/udS5mHEiVvNwdC1prB0j4Gfp6t4YaURuo8I8KvoBQpLljaNO 142GuOyI7dGSJNQUrZgJMDuJpVUr7lmGdPI/41eVUe461HqoVBkKDjAbZcnlMOPTk+YJ olrDMisoUHS4InNYYlDc5JqKJBpZ/LMLcGIFaKXb+41CzcuuW/3VpebJtmKqcDVcfo9G cDskyiQT9SiSbE9QLZYv/yjB2j3xodSn/CSRNFPmJ59TJtFKwWJnt/phPyYnMB4ZuJqh UcFUyHYMqIDgkcSGCgjai4hNVtXR8T+zRIWbwgNQR9la+EVPNsU8FEJkOpzNj3YpwzQQ IjqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UKz3VNDT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14si2726303pfj.144.2019.03.06.16.01.02; Wed, 06 Mar 2019 16:01:18 -0800 (PST) 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=@google.com header.s=20161025 header.b=UKz3VNDT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726618AbfCGAAN (ORCPT + 99 others); Wed, 6 Mar 2019 19:00:13 -0500 Received: from mail-vk1-f201.google.com ([209.85.221.201]:49142 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbfCGAAL (ORCPT ); Wed, 6 Mar 2019 19:00:11 -0500 Received: by mail-vk1-f201.google.com with SMTP id j1so7389907vkj.15 for ; Wed, 06 Mar 2019 16:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=PqjENvzleKHq5r7VnPhuqFw2a2C+H2yOqXdiGG7oaFo=; b=UKz3VNDTrFINv1Zw1JIFlqxV6jtbW7ksegxAkGlnfJsvZM35PiRWCSDU3Foos2uiey 19kv+vj6oA5hcbIwcgitp8WcFyB64OdSGSJ/jVFTor6v9eKAvxBalM5dQZBERK/hVX/K F3OfCSW1PtffLcFO9mRmYFX1aJamjaEvbYwb0uULRCQmdb1uVatPgt7rAIiBcIfcOpew UQYi0FtKWccFFwG/ALEqEyjM3VfvjODjBz/ir7sywBOSGb+/7kr67LQr6Z2/bKTgIdAB xx5E2HnliBJTFtriJjYVkSBtEJYM5VtBjvOJFlDe6NuVu8GdwK+i01HjUm+aiz26RW6f z7oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=PqjENvzleKHq5r7VnPhuqFw2a2C+H2yOqXdiGG7oaFo=; b=oIx9yKb87tk78zhl00PZfzUDQArEY692eeDz5IioftEPJS9RcNl3nHuXlreGpw6hbb CGZikNFt1noKuMs60Dr5KomDURsJOrxUR7FsLv6x5W6LcW91rsV49kdeKRvOuRmM871r GPuKUvDMRMgBT+jG5NsbcwnB3M4663cQ15Rbc/TEN81aaGGUkh/1W3DNEqWDwYW+LL39 +qfMUq51TtZSZFSTvhqHP/7Kzodfd8Ht9ciECxCS//9LxXRYiIc1DQk6zeyrtOhwIfSw cfGCvq9BZQ6JI/VeHp02gj8iyigCsZEW0iWLQMpZh6bgAngK+sH5u2/EtXDrMPmNdzxv t2tw== X-Gm-Message-State: APjAAAXrv/QzG2JWQvImbrFtuXUdUx+R8/6nh4EE2en5GZKep8I7RH3r sNAydFR2a7P2ILwbapzl+N4ZH/MEjiM1Nxy9yQ8nBg== X-Received: by 2002:ab0:b98:: with SMTP id c24mr6860349uak.19.1551916810289; Wed, 06 Mar 2019 16:00:10 -0800 (PST) Date: Wed, 6 Mar 2019 15:59:03 -0800 In-Reply-To: <20190306235913.6631-1-matthewgarrett@google.com> Message-Id: <20190306235913.6631-18-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190306235913.6631-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog Subject: [PATCH 17/27] acpi: Disable APEI error injection if the kernel is locked down From: Matthew Garrett To: jmorris@namei.org Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linn Crosetto ACPI provides an error injection mechanism, EINJ, for debugging and testing the ACPI Platform Error Interface (APEI) and other RAS features. If supported by the firmware, ACPI specification 5.0 and later provide for a way to specify a physical memory address to which to inject the error. Injecting errors through EINJ can produce errors which to the platform are indistinguishable from real hardware errors. This can have undesirable side-effects, such as causing the platform to mark hardware as needing replacement. While it does not provide a method to load unauthenticated privileged code, the effect of these errors may persist across reboots and affect trust in the underlying hardware, so disable error injection through EINJ if the kernel is locked down. Signed-off-by: Linn Crosetto Signed-off-by: David Howells Reviewed-by: "Lee, Chun-Yi" cc: linux-acpi@vger.kernel.org Signed-off-by: Matthew Garrett --- drivers/acpi/apei/einj.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index fcccbfdbdd1a..9fe6bbab2e7d 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -518,6 +518,9 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, int rc; u64 base_addr, size; + if (kernel_is_locked_down("ACPI error injection")) + return -EPERM; + /* If user manually set "flags", make sure it is legal */ if (flags && (flags & ~(SETWA_FLAGS_APICID|SETWA_FLAGS_MEM|SETWA_FLAGS_PCIE_SBDF))) -- 2.21.0.352.gf09ad66450-goog