Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp40924imb; Thu, 28 Feb 2019 15:20:32 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia/r5eykVMaetJvbsbAl/kYImPsyab3r/QzCE1Wm3s2udTMS8WUSIATnmjq/0D2j02lIOXF X-Received: by 2002:a62:204f:: with SMTP id g76mr2336218pfg.100.1551396032268; Thu, 28 Feb 2019 15:20:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551396032; cv=none; d=google.com; s=arc-20160816; b=aKt4UagJQa1eyZ6gSbiC9TVQiOsA3Dln1FH3CbI2jxNecmYrmlXRNlz3TEvsDJr+Mp h+vhISkbtZfqUC+ZavAhyCkRfqshYZX9+jFf1/5z4YaH9Uk6Gs3kRp5iK/rsJQ64qudI zF0vDl73tPZHJSEeTe9HtXLszUuMGb93D7g940pIDKY6UtlrOGcbN/5UKRdhCI/KCnFF R5nwt+Eipxb+BCIMrDQ3VVbbbrCXn++ZvlaKm0EDVrPygZMZ6clAlikxcGIvHBMtaEpT rBTt2vP+X4+PL6qR3zElTZg3dngQq5P/ktWQYwGLNk8FUcEnDPkx3H3v7nn2Jvlar0Ib szUQ== 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=0c4DnPm/cx2jzTzIvXsNGvNdz/XPR522PUMTkwR1KuQ=; b=v1v8XoB4s1tnNTnAhReZB6hZocGUnp0Nzl8vTKKR8fT0H9gzp18S0e8217t6uzeTKW 2akGJqO3HkQmcJX8Lqyv/vBYnNzlv+aSQIwBog4tU5sA4H2SKGwwsrcCY1tzw8VqxWON jO4VokWL3Suk779o2lcpy+WQ+eTxKB7Hcd4GNCcAmM0k/mXhubDB2+AhswegBHfZIcaZ YJ1mVzEbBSg2exisaoqxVl4+3nDjlS0iwaFK9lMBrKLwCPGFMP+P8Iw1cLJZzqVc62UB j7jBRG7HOw7K+co/opfm8F5waqsQIA/CIVMUNBlUdCJPgR96Ib1k+qhBQxo0bsRXxwRL Dn1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uyKcSgko; 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 b60si19283427plc.95.2019.02.28.15.20.13; Thu, 28 Feb 2019 15:20:32 -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=uyKcSgko; 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 S2387973AbfB1XMu (ORCPT + 99 others); Thu, 28 Feb 2019 18:12:50 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:35306 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387939AbfB1XMt (ORCPT ); Thu, 28 Feb 2019 18:12:49 -0500 Received: by mail-pl1-f201.google.com with SMTP id d17so16232733pls.2 for ; Thu, 28 Feb 2019 15:12:49 -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=0c4DnPm/cx2jzTzIvXsNGvNdz/XPR522PUMTkwR1KuQ=; b=uyKcSgkoAKvFlpnGAcowfxwKxFJXbTANnMFv51NpWe1AQ9/g7xJ6nr0sF8jaUuyoul uheLayLR/gi5715AElFU1bWdzgUWltb5IZ0nXAomZakOxNSpH+KCAecD8F8akvxCHdlC 62ZkceTDBnB2i4cqSDOvE/aLMZ7zRpKy25snYHxLAmT9nWEi2kONGe2/F3wKJWB6g3W+ uXs1Q/e78G7v51pN6kV0j+y1Q0Wb6SDhobx6DQmfNW5yielNATjHv2sEohO/V+QpdFRN H7o5fhkzSZxYHkWXpUYVUApxgbUEgszPFqoPnDXUK9xPMae+MagL9xmcTnvSB+X1Dn9t U0aQ== 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=0c4DnPm/cx2jzTzIvXsNGvNdz/XPR522PUMTkwR1KuQ=; b=Vx5owwNtD7NhMFHN7W0SGq4RyBrOXm/fY0laPrwVmw64F29/tzc55zUFkosHZ347NC rqPedopS03VAfg1pu4PHDEL1Zkiqv6FxG9t43h5broBt/vpII96UxPS5rgfSp5tt2fId qlKdHkG/yAK4GGCwS4Xg7RhSc7/qvt9HpRqFTF+wwNAKqD+phM2832cD67ndA1rv2sCD jNXBc+jKdw7KqK07LhSgdWaMe/zql7i7czjLFnZY1+LcmZ651ykWBByu6PiafVExe9O0 srqs/ilX22M8uLdr2u6VSTHzPHMIZzR0lfJtHPOtCa81DnslC15YgVA5Hz9Qemtv/JaO jPBA== X-Gm-Message-State: AHQUAuZ4qMXw7hOV6/ULl+794zhyJkXvFv5zpbZdmdyQJnH/F8DVCH2P b9pW9YQwYXVdMMpHzlcIUKrRNwODo27Tv/E0jxSDqQ== X-Received: by 2002:a62:121a:: with SMTP id a26mr972694pfj.47.1551395568702; Thu, 28 Feb 2019 15:12:48 -0800 (PST) Date: Thu, 28 Feb 2019 15:11:53 -0800 In-Reply-To: <20190228231203.212359-1-matthewgarrett@google.com> Message-Id: <20190228231203.212359-17-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190228231203.212359-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 --- 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