Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp83810ybi; Thu, 20 Jun 2019 18:21:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqRCR/dNKpmyBsRCLcaLpy/YFp4Zf099az6MZ0MmKWnsyP1adljT7YOeLpvT3qbChfoQmu X-Received: by 2002:a63:6a49:: with SMTP id f70mr15225218pgc.55.1561080090916; Thu, 20 Jun 2019 18:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561080090; cv=none; d=google.com; s=arc-20160816; b=CQ0boWoUGZjlf35r27t/IKxVcHLAS1pOFjwAawXm5b20dxHBDx9XDImCzRWhdUGF9F K91gRsOoYINR/vYHhyHB3xCOsAmaUIsHglgenrI+skqn1vrNL6MHfmz12QRWBWSGvjEl RrpD5CTWICLMj/0mXVs/ICnd7M2S0dnqXLj7gC2q8/Qq+xdI1SNKm2ZgFhblrQSKeMF3 9F62lefpGTk5yyvd5YLx7jROl5y3xdWQmokjZmz749brjJolUDzXSMpYJMQPPw+2pmft VDfmkFmQZBM8PWQ25jnR3YhpRAqIjnarI34fcG/5KYErqH91xkP4jjp28dKP2b+BhRgo xkVg== 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=21zVfVQIgxs18frGEjlMaz6K2O9ZtjPmBWXUPVoOvcs=; b=VZsOjgzhg8JOQ/zfhsytijWzBZgipDDHilyWWUZ1K1tbRUeauvEo9bkXzOH9AQrL8U T06WxoYNFJYhnA9PNM6qqdgKUXvP0EN7UoKSaZOwsm61RjaqgSVKsTPJpINS6ooNfHSC d+bKSpJ0tu9u17sHk/hZq9N8GLwswU3fiWFEl4U73hmlf3zO7bskqpxzkOqrXa3My5s+ 6Ix4BxXbQ7tsKhNawL8WvPC1vvA6LTEDS08IILjtrj2EeLkI+3e60L/klZVAJoXAMhEO At8kEqvJhojERwESi+jwixxvXzfoLFR9y5HJEW8VyIoiRC95+1UAv+gpihD8T0YV0rRR P7Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=WyOmpA9Q; 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 a22si1045389pgw.60.2019.06.20.18.21.14; Thu, 20 Jun 2019 18:21:30 -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=WyOmpA9Q; 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 S1726772AbfFUBUm (ORCPT + 99 others); Thu, 20 Jun 2019 21:20:42 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:56048 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726725AbfFUBUd (ORCPT ); Thu, 20 Jun 2019 21:20:33 -0400 Received: by mail-pg1-f201.google.com with SMTP id b10so2949803pgb.22 for ; Thu, 20 Jun 2019 18:20:33 -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=21zVfVQIgxs18frGEjlMaz6K2O9ZtjPmBWXUPVoOvcs=; b=WyOmpA9QtPvqxVTlHFAr1aYSi9expt/Y60JFM3suEeorE0t0yy/GrUS6vGGOUzScpn JWZAFEuq63FT1Mk6EFCTu9MKkPJwkf6/tNKBPo/ySXxusxtXZjsaTBT6xs8DpkhwinQ5 FTZ2Sxvb8IZVoca4y42ewg/D89PAQq98EgQWP4Nv/z2yRE6dIbskvmYmpCRgKGY17NII SxM05/6NL1lIjhSm9Fc/EvF6I9txsfx6UkmcI2qGr0BzsfKJ35bbQYacXol/JRRmPs9r F4qDUqadiASSdMEkkd/udpLqwhtA7xlA60IhnZSY0xQ/cN6d/wGSp+5h8Lo/i0xiMjM8 qLxQ== 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=21zVfVQIgxs18frGEjlMaz6K2O9ZtjPmBWXUPVoOvcs=; b=qT3WRlmF2PJAJQSfsImD6+tM2dYZfhy5IeSzDWnNziuA5shpy/uD18C+3S+PExg4An lFjyzTA8FWxvwaTk2z66dQZYTzEz71Fr4zYS9ewK5REic298OPiFUAziJhSvVzIa0YTO jH8LNyuF9QoTQgvNjK+S1DeW2HBo99aFj1ZCfWHbeRXtzpkJHykCKxE0FkSfmnXhA2Fn rt4Njy78S7ST9TRR03rushnprsFxBq1wi9doqB5q1JjfVxbjoeJ9gl5B1QeysoJSJh02 H83ZXqfYul7t/IndPKQufjrmTM9aGZRcs+99eypt3wg4GgZff220h4pkpw4gRxnupLTU llew== X-Gm-Message-State: APjAAAVJ24u0aRUfxg4vxhNrjuX4RsWMrIaGnUG6RCtk6fip5GS+6iCa NBYxQPI4goNIC8DTrAgq8a/aqqZzFyEywdbSTMBl2Q== X-Received: by 2002:a63:5152:: with SMTP id r18mr15484090pgl.324.1561080032751; Thu, 20 Jun 2019 18:20:32 -0700 (PDT) Date: Thu, 20 Jun 2019 18:19:29 -0700 In-Reply-To: <20190621011941.186255-1-matthewgarrett@google.com> Message-Id: <20190621011941.186255-19-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190621011941.186255-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH V33 18/30] Prohibit PCMCIA CIS storage when the kernel is locked down From: Matthew Garrett To: jmorris@namei.org Cc: linux-security@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, David Howells , Dominik Brodowski , Matthew Garrett 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 Prohibit replacement of the PCMCIA Card Information Structure when the kernel is locked down. Suggested-by: Dominik Brodowski Signed-off-by: David Howells Signed-off-by: Matthew Garrett --- drivers/pcmcia/cistpl.c | 4 ++++ include/linux/security.h | 1 + security/lockdown/lockdown.c | 1 + 3 files changed, 6 insertions(+) diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index ac0672b8dfca..fb54e262578c 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -1578,6 +1579,9 @@ static ssize_t pccard_store_cis(struct file *filp, struct kobject *kobj, struct pcmcia_socket *s; int error; + if (security_is_locked_down(LOCKDOWN_PCMCIA_CIS)) + return -EPERM; + s = to_socket(container_of(kobj, struct device, kobj)); if (off) diff --git a/include/linux/security.h b/include/linux/security.h index 88d0f5d0cd87..87c433f1e7db 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -90,6 +90,7 @@ enum lockdown_reason { LOCKDOWN_IOPORT, LOCKDOWN_MSR, LOCKDOWN_ACPI_TABLES, + LOCKDOWN_PCMCIA_CIS, LOCKDOWN_INTEGRITY_MAX, LOCKDOWN_CONFIDENTIALITY_MAX, }; diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c index bfc0e088aa85..ced4ddbb36b4 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -26,6 +26,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_IOPORT] = "raw io port access", [LOCKDOWN_MSR] = "raw MSR access", [LOCKDOWN_ACPI_TABLES] = "modified ACPI tables", + [LOCKDOWN_PCMCIA_CIS] = "direct PCMCIA CIS storage", [LOCKDOWN_INTEGRITY_MAX] = "integrity", [LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality", }; -- 2.22.0.410.gd8fdbe21b5-goog