Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp6479055ybi; Wed, 31 Jul 2019 15:21:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqw49sFIz+c/19vMy6tNwsDgHVRgm6TtcJxgFfn6bFJGVsGaXOAlVGA4SJM6PT868BPoiINe X-Received: by 2002:a17:902:2baa:: with SMTP id l39mr123780838plb.280.1564611689927; Wed, 31 Jul 2019 15:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564611689; cv=none; d=google.com; s=arc-20160816; b=Kt0AfiKZ/jdVQkAicWGQPVXbRLs/ZJsrqlO1fo3qkBOkuYiH9HzohBoaRR5Uw305UH sbL+Wfa4xfkTgA429YLceLOcXs7wVISSgO94pR4QO1bO+7HlKEEOjH8hI9c0YMgP2rwF mY+WFXixJ0ZSU/dcEkQazFlYK+h0wtxZbeC5WOY5N8YWtPT2YfjKpDCE2STwgqEBYmPY fV8WEf8xQ2oZDz+K0Go2Rh8ZYeCxAIqU8gXanaeRYMOqfbFo7zEgK+ajvtTWJpeGO0Sf boRrrDBvxKL1cIAxNzESyySm+iKAvpnbO1epGcV+hw3GgCfdIgDa+LyGuX0yn/OVw+vA djug== 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=0wvr7l0OfQCpncv5jcw0tGNb43fa+c615YU3AwXBobQ=; b=WuxcLBn5AE9oXLgkljTLkTZ2auLiq/JtsjDxfZIqrytsoyiFBnURAFtzz3Z0AM/5ms E07BTiYXqfm7lVzxp9seTGuMibhxRjucxVYc16ypTX8dRADKwhF0lMX+8B30p9IEwiMU XGEHNUJsvQiAVWJCLNWXYlNNhwzGkoKyzjJO8kv4FiS2O9WUZjc512l3zixQulFhHdm0 A5cidmHjZxJrh7OCL34OSUGecB09csvQzpcz+N0lh0J9JQCFWh2uk7K1Ltw+8A8YyMkC TZ3FiN8lyJRWLEHV7s4Kl8kvd514eBvGPi5a1uT6M6+2yQ6v1DtyPBBdP/5t6bDThHCD kMKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=JtMG+7Gf; 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 s5si32027898plq.219.2019.07.31.15.21.14; Wed, 31 Jul 2019 15:21:29 -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=@google.com header.s=20161025 header.b=JtMG+7Gf; 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 S1731356AbfGaWRV (ORCPT + 99 others); Wed, 31 Jul 2019 18:17:21 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:49644 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731347AbfGaWRS (ORCPT ); Wed, 31 Jul 2019 18:17:18 -0400 Received: by mail-qt1-f202.google.com with SMTP id l16so56107764qtq.16 for ; Wed, 31 Jul 2019 15:17:17 -0700 (PDT) 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=0wvr7l0OfQCpncv5jcw0tGNb43fa+c615YU3AwXBobQ=; b=JtMG+7GfDdoaoq8E+Gpj5xUJvOyHAHIBQYN/5LMZv06DTj6ZvlEm2cJUCONAwzGUbP GK36LK9w+ftPnukYabwQIKWRmVwDi4Pl1KEKPEDvl7Fo3u/OJlTVhn3iV1fWGbjoy7QN s/HadNGszchMetFyBlbfiOchIuq8Tjvbgfm9Za5ZK20lXUFd79+hX5IE0h7NK+KIe4Xk jS4zcSBFQ3AEbVpTjuh/miN5rqBsVs1zzhXIKrsVVIkKzgVZZc6DQOgKMnowxWxNcRV4 gvGcQMZ9j9NkVGd9ArI82+xY/6cbbO0HFaHWXRZ+aEgjjS7Ix3QR6oGrnLeWOcVNfSTA uruw== 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=0wvr7l0OfQCpncv5jcw0tGNb43fa+c615YU3AwXBobQ=; b=DaQF+R1wRByghaIRqPcYHSOfv4cGHyv/dtpNxz0nQi4eefpr5vAsa/cwEEUKHPwHQS RmcX+BYy/CgUVMnrX8xjhn5npWRunT6FPo4lf+70EQ8bd8h+olnEivngwjLQDb07eFii UlozdEtRKlFdM8g+AohOhPqEGEpGNtpGbgtNYOt08kyViIJWCfy5UpRzVVFhxkJyAPVc xGcihNJqAA8JYiLvNSv4noaH5ON1xPeWufaO3xrtvrGLkKCEX34CIru0nrtXzsBfdG4S +XSGbY+TC6AP8zCjdJXQmb4r8bsNF0UHsA+LUXlnfUirWTHOUSw6/9ixBj/JNz89xbPL nb7A== X-Gm-Message-State: APjAAAWd/z0IcH9N7NkWZ0QLln2J0dozQ3/Wo8bTuZGo3jsYgzwIHaJJ uGhByozPcAUT2fB0LmsoV3daoegtibllgMmxujN5jw== X-Received: by 2002:a37:d95:: with SMTP id 143mr52836481qkn.132.1564611437244; Wed, 31 Jul 2019 15:17:17 -0700 (PDT) Date: Wed, 31 Jul 2019 15:16:08 -0700 In-Reply-To: <20190731221617.234725-1-matthewgarrett@google.com> Message-Id: <20190731221617.234725-21-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190731221617.234725-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog Subject: [PATCH V37 20/29] x86/mmiotrace: Lock down the testmmiotrace module From: Matthew Garrett To: jmorris@namei.org Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, David Howells , Thomas Gleixner , Matthew Garrett , Steven Rostedt , Kees Cook , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org 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: David Howells The testmmiotrace module shouldn't be permitted when the kernel is locked down as it can be used to arbitrarily read and write MMIO space. This is a runtime check rather than buildtime in order to allow configurations where the same kernel may be run in both locked down or permissive modes depending on local policy. Suggested-by: Thomas Gleixner Signed-off-by: David Howells Acked-by: Steven Rostedt (VMware) Reviewed-by: Kees Cook cc: Thomas Gleixner cc: Steven Rostedt cc: Ingo Molnar cc: "H. Peter Anvin" cc: x86@kernel.org --- arch/x86/mm/testmmiotrace.c | 5 +++++ include/linux/security.h | 1 + security/lockdown/lockdown.c | 1 + 3 files changed, 7 insertions(+) diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c index 0881e1ff1e58..a8bd952e136d 100644 --- a/arch/x86/mm/testmmiotrace.c +++ b/arch/x86/mm/testmmiotrace.c @@ -8,6 +8,7 @@ #include #include #include +#include static unsigned long mmio_address; module_param_hw(mmio_address, ulong, iomem, 0); @@ -115,6 +116,10 @@ static void do_test_bulk_ioremapping(void) static int __init init(void) { unsigned long size = (read_far) ? (8 << 20) : (16 << 10); + int ret = security_locked_down(LOCKDOWN_MMIOTRACE); + + if (ret) + return ret; if (mmio_address == 0) { pr_err("you have to use the module argument mmio_address.\n"); diff --git a/include/linux/security.h b/include/linux/security.h index 43fa3486522b..3f7b6a4cd65a 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -114,6 +114,7 @@ enum lockdown_reason { LOCKDOWN_PCMCIA_CIS, LOCKDOWN_TIOCSSERIAL, LOCKDOWN_MODULE_PARAMETERS, + LOCKDOWN_MMIOTRACE, LOCKDOWN_INTEGRITY_MAX, LOCKDOWN_CONFIDENTIALITY_MAX, }; diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c index 5177938cfa0d..37b7d7e50474 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -29,6 +29,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_PCMCIA_CIS] = "direct PCMCIA CIS storage", [LOCKDOWN_TIOCSSERIAL] = "reconfiguration of serial port IO", [LOCKDOWN_MODULE_PARAMETERS] = "unsafe module parameters", + [LOCKDOWN_MMIOTRACE] = "unsafe mmio", [LOCKDOWN_INTEGRITY_MAX] = "integrity", [LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality", }; -- 2.22.0.770.g0f2c4a37fd-goog