From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BABB0C7618F for ; Thu, 18 Jul 2019 19:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 933F421851 for ; Thu, 18 Jul 2019 19:45:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CJD3zXMJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404165AbfGRTpf (ORCPT ); Thu, 18 Jul 2019 15:45:35 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:48595 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404140AbfGRTpe (ORCPT ); Thu, 18 Jul 2019 15:45:34 -0400 Received: by mail-pl1-f202.google.com with SMTP id i33so14454399pld.15 for ; Thu, 18 Jul 2019 12:45:34 -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=hUShFVcCo5z4Vl3457oUOrEoTffedxXk2/9xvS7FuNM=; b=CJD3zXMJRh5tbW+A67mz1tOJy0iCefcuHuCF9CqC00ee5HPWJ+EPTRYHQ8ajqBaBpk On5yctHipOLwatF4emIFuwjwV4cAL/4CHJqeWsraFBTrkYS5b1MYzf8yGymfU0hD7iNY kW6VS8hGFeCkYQyskxGv+nFgLhidXD2Hu5eS9gqPw/vt5pzoyeIrOqfu3bgU3NyBcKIl zU+zCVGeTrV3lqhR4r4KmuJjkRO5PReh2YnByyV4Ds2akzBp83izrunExNbHqoSA9cQ8 O09OnKxXaQt5yUg5K/5hIhJVWUv3q7aUBmQg9Rb3d1QKzQuH31I3UY8gXT2lsOIsIEWu LzZA== 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=hUShFVcCo5z4Vl3457oUOrEoTffedxXk2/9xvS7FuNM=; b=eLoykHAZJ/0E2XWOaWkEoLidnXYYOQFhJkIFu7GZNpyccTUzZSWvQlgQT6GScBLVke nkOjy/Zrkecw6DcFNHx/Ksot67M6OfNqofplOQ6eHEcZOGWeHo4nWBAaHpYUQfUxvhH0 o2xg4+az52MTCRy+f7e5iGSXFc4KVBQJCqyc/DS0BKmi6yL0QUi9XbLImcaIbp+5zwyL lhyX2i5D83xOH357TpcClDYG0XVfaLJvjvfFfksOlT7GqpQ4v6bDO2II04MWvTMQtXnU aCDk1IqIie6LIlUJals6beb7uxFtH+Ll1ahhrOhwaM0gYfc8DEgCZkE77ZMuJf1AYfPV soJQ== X-Gm-Message-State: APjAAAU+1YTcdunIfPJpSd4pevscuCJnL6K8S71YJiMZXwr8pGSCDpmh GwBQyG0QdMwAMVtYOIIWScCvGAMQ9BYUj/hnQoRlOw== X-Google-Smtp-Source: APXvYqxRl0m6R5tyypODQDLX5ZwoNGI0xsocAUQ1JRoVVkexFRxjj6K1/Odu3+aEPQS9ZHP7Elcf+U+H3Mj9DB3einjMDw== X-Received: by 2002:a63:1310:: with SMTP id i16mr48823144pgl.187.1563479133401; Thu, 18 Jul 2019 12:45:33 -0700 (PDT) Date: Thu, 18 Jul 2019 12:44:15 -0700 In-Reply-To: <20190718194415.108476-1-matthewgarrett@google.com> Message-Id: <20190718194415.108476-30-matthewgarrett@google.com> Mime-Version: 1.0 References: <20190718194415.108476-1-matthewgarrett@google.com> X-Mailer: git-send-email 2.22.0.510.g264f2c817a-goog Subject: [PATCH V36 29/29] lockdown: Print current->comm in restriction messages From: Matthew Garrett To: jmorris@namei.org Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Matthew Garrett , David Howells , Matthew Garrett , Kees Cook 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 Print the content of current->comm in messages generated by lockdown to indicate a restriction that was hit. This makes it a bit easier to find out what caused the message. The message now patterned something like: Lockdown: : is restricted; see man kernel_lockdown.7 Signed-off-by: David Howells Signed-off-by: Matthew Garrett Reviewed-by: Kees Cook --- fs/proc/kcore.c | 5 +++-- security/lockdown/lockdown.c | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index ee2c576cc94e..e2ed8e08cc7a 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -548,11 +548,12 @@ static int open_kcore(struct inode *inode, struct file *filp) { int ret = security_locked_down(LOCKDOWN_KCORE); - if (ret) - return ret; if (!capable(CAP_SYS_RAWIO)) return -EPERM; + if (ret) + return ret; + filp->private_data = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!filp->private_data) return -ENOMEM; diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c index 173191562047..f6c74cf6a798 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -81,10 +81,14 @@ early_param("lockdown", lockdown_param); */ static int lockdown_is_locked_down(enum lockdown_reason what) { + if (WARN(what >= LOCKDOWN_CONFIDENTIALITY_MAX, + "Invalid lockdown reason")) + return -EPERM; + if (kernel_locked_down >= what) { if (lockdown_reasons[what]) - pr_notice("Lockdown: %s is restricted; see man kernel_lockdown.7\n", - lockdown_reasons[what]); + pr_notice("Lockdown: %s: %s is restricted; see man kernel_lockdown.7\n", + current->comm, lockdown_reasons[what]); return -EPERM; } -- 2.22.0.510.g264f2c817a-goog