From patchwork Wed May 13 15:21:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 11546683 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8199913 for ; Wed, 13 May 2020 15:21:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D9B52065D for ; Wed, 13 May 2020 15:21:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589383288; bh=ppbpJ/tiGc6AAsfEyrLUH1GG5EABg4BNhApQAkuqWOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u/Ukam0exrDvdcTnvUztmWqvAg1/+Z0XvkjJ5igYcaqYGM4cJVVjdLJudAQ2K9i1D 0PYP4wN5yMyhdM08BONT6G55GHc6gCLm6mCCiuVPU2+YLWkQB2qlNXD4IYeaHWxBPK vMco9anmObC5GoU4hE0FEklnbiVSF1/tSxK1mTLY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389219AbgEMPVU (ORCPT ); Wed, 13 May 2020 11:21:20 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45436 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389208AbgEMPVS (ORCPT ); Wed, 13 May 2020 11:21:18 -0400 Received: by mail-pg1-f195.google.com with SMTP id r22so6331688pga.12; Wed, 13 May 2020 08:21:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sVPbNXCCooK7xs5q4tPUuYOkgiYvbFLYSsM11573Kow=; b=YhDWrrl2YmwuH6C/D6LSsdpjxidKPlizPVkQWMRXllgx3ceBr1IntjbXMl+ifzoTgR aizwY8YDCsWmkTD7K8C9/kivgxMwnQux5aKY8JenJKS03v0FG0HFkhDNudYu02LpQys6 uUV0FwO1GEZJ/DbCJuA07svfqThOgwRcC8gXcG+NYmc/xyg/s6SN6gT6XT46DYB3s8fC 0nLIBE3rEF22KDUq1G3ixdZE3pAyptD/8DEAxcA+gZLe45GbFLz6HYV5kTsGRuUXag0x u3Wvd01dxdkBUFxg4tJC4c6/89w8bSSwdhOt6ywUp2aYYnLc9KFPwrpA7CM/mP5z+kl/ TH7Q== X-Gm-Message-State: AGi0PuZLuVf1EFRDhDUZWmNPZCkJcBFjgNqn5zVWX/2dUBFxFxQM8ZjR IniRsMUxCEKVz47lxsO0Uv/VccKXZBxNuQ== X-Google-Smtp-Source: APiQypKJxNQFZPpCeObFfzlvgoO/y5iJXbbt0fp6k+Bh0324QO2zLbObQGGHUWDJ+UruNtob9Uv7wQ== X-Received: by 2002:aa7:80cf:: with SMTP id a15mr28046474pfn.124.1589383276926; Wed, 13 May 2020 08:21:16 -0700 (PDT) Received: from 42.do-not-panic.com (42.do-not-panic.com. [157.230.128.187]) by smtp.gmail.com with ESMTPSA id n23sm15605462pjq.18.2020.05.13.08.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 08:21:13 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id 7045741D95; Wed, 13 May 2020 15:21:12 +0000 (UTC) From: Luis Chamberlain To: viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org, rafael@kernel.org, ebiederm@xmission.com, jeyu@kernel.org, jmorris@namei.org, keescook@chromium.org, paul@paul-moore.com, stephen.smalley.work@gmail.com, eparis@parisplace.org, nayna@linux.ibm.com, zohar@linux.ibm.com Cc: scott.branden@broadcom.com, dan.carpenter@oracle.com, skhan@linuxfoundation.org, geert@linux-m68k.org, tglx@linutronix.de, bauerman@linux.ibm.com, dhowells@redhat.com, linux-integrity@vger.kernel.org, linux-fsdevel@vger.kernel.org, kexec@lists.infradead.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 3/3] fs: move kernel_read*() calls to its own symbol namespace Date: Wed, 13 May 2020 15:21:08 +0000 Message-Id: <20200513152108.25669-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20200513152108.25669-1-mcgrof@kernel.org> References: <20200513152108.25669-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Signed-off-by: Luis Chamberlain --- drivers/base/firmware_loader/main.c | 1 + fs/exec.c | 6 +++--- kernel/kexec_file.c | 2 ++ kernel/module.c | 1 + security/integrity/digsig.c | 3 +++ security/integrity/ima/ima_fs.c | 3 +++ security/integrity/ima/ima_main.c | 2 ++ security/loadpin/loadpin.c | 2 ++ security/security.c | 2 ++ security/selinux/hooks.c | 2 ++ 10 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index 5296aaca35cf..a5ed796a9166 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -44,6 +44,7 @@ MODULE_AUTHOR("Manuel Estrada Sainz"); MODULE_DESCRIPTION("Multi purpose firmware loading support"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(CORE_FS_READ); struct firmware_cache { /* firmware_buf instance will be added into the below list */ diff --git a/fs/exec.c b/fs/exec.c index 30bd800ab1d6..bbe2a35ea2e0 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1008,7 +1008,7 @@ int kernel_read_file_from_path(const char *path, void **buf, loff_t *size, fput(file); return ret; } -EXPORT_SYMBOL_GPL(kernel_read_file_from_path); +EXPORT_SYMBOL_NS_GPL(kernel_read_file_from_path, CORE_FS_READ); int kernel_read_file_from_path_initns(const char *path, void **buf, loff_t *size, loff_t max_size, @@ -1034,7 +1034,7 @@ int kernel_read_file_from_path_initns(const char *path, void **buf, fput(file); return ret; } -EXPORT_SYMBOL_GPL(kernel_read_file_from_path_initns); +EXPORT_SYMBOL_NS_GPL(kernel_read_file_from_path_initns, CORE_FS_READ); int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size, enum kernel_read_file_id id) @@ -1050,7 +1050,7 @@ int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size, fdput(f); return ret; } -EXPORT_SYMBOL_GPL(kernel_read_file_from_fd); +EXPORT_SYMBOL_NS_GPL(kernel_read_file_from_fd, CORE_FS_READ); ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len) { diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index bb05fd52de85..d96b7c05b0a5 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -28,6 +28,8 @@ #include #include "kexec_internal.h" +MODULE_IMPORT_NS(CORE_FS_READ); + static int kexec_calculate_store_digests(struct kimage *image); /* diff --git a/kernel/module.c b/kernel/module.c index 8973a463712e..f14868980080 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -60,6 +60,7 @@ #include "module-internal.h" MODULE_IMPORT_NS(SECURITY_READ); +MODULE_IMPORT_NS(CORE_FS_READ); #define CREATE_TRACE_POINTS #include diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index e9cbadade74b..d68ef41a3987 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c @@ -13,11 +13,14 @@ #include #include #include +#include #include #include #include "integrity.h" +MODULE_IMPORT_NS(CORE_FS_READ); + static struct key *keyring[INTEGRITY_KEYRING_MAX]; static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = { diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index e3fcad871861..41fd03281ae1 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -20,6 +20,9 @@ #include #include #include +#include + +MODULE_IMPORT_NS(CORE_FS_READ); #include "ima.h" diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index f96f151294e6..ffa7a14deef1 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -28,6 +28,8 @@ #include "ima.h" +MODULE_IMPORT_NS(CORE_FS_READ); + #ifdef CONFIG_IMA_APPRAISE int ima_appraise = IMA_APPRAISE_ENFORCE; #else diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c index ee5cb944f4ad..ca2022ad5f88 100644 --- a/security/loadpin/loadpin.c +++ b/security/loadpin/loadpin.c @@ -17,6 +17,8 @@ #include /* current */ #include +MODULE_IMPORT_NS(CORE_FS_READ); + static void report_load(const char *origin, struct file *file, char *operation) { char *cmdline, *pathname; diff --git a/security/security.c b/security/security.c index bdbd1fc5105a..c865f1de4b03 100644 --- a/security/security.c +++ b/security/security.c @@ -29,6 +29,8 @@ #include #include +MODULE_IMPORT_NS(CORE_FS_READ); + #define MAX_LSM_EVM_XATTR 2 /* How many LSMs were built into the kernel? */ diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 9979b45e0a34..6dc4abfbfb78 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -103,6 +103,8 @@ #include "audit.h" #include "avc_ss.h" +MODULE_IMPORT_NS(CORE_FS_READ); + struct selinux_state selinux_state; /* SECMARK reference count */