fs: move kernel_read_file* to its own include file
Subsystems (13)
PATCH v3 1/1 fs: move kernel_read_file* to its own include file
Move kernel_read_file* out of linux/fs.h to its own linux/kernel_read_file.h include file. That header gets pulled in just about everywhere and doesn't really need functions not related to the general fs interface.
---
Changes since v2:
Added changes information here.
Changes since v1:
Updated commit message to give Christoph's reasoning as to why the functions should be moved to another header file.
--- drivers/base/firmware_loader/main.c | 1 + fs/exec.c | 1 + include/linux/fs.h | 39 ---------------------- include/linux/ima.h | 1 + include/linux/kernel_read_file.h | 52 +++++++++++++++++++++++++++++ include/linux/security.h | 1 + kernel/kexec_file.c | 1 + kernel/module.c | 1 + security/integrity/digsig.c | 1 + security/integrity/ima/ima_fs.c | 1 + security/integrity/ima/ima_main.c | 1 + security/integrity/ima/ima_policy.c | 1 + security/loadpin/loadpin.c | 1 + security/security.c | 1 + security/selinux/hooks.c | 1 + 15 files changed, 65 insertions(+), 39 deletions(-) create mode 100644 include/linux/kernel_read_file.h
drivers/base/firmware_loader/main.c +1 -0
@@ -12,6 +12,7 @@#include <linux/capability.h> #include <linux/device.h> +#include <linux/kernel_read_file.h> #include <linux/module.h> #include <linux/init.h> #include <linux/timer.h>
fs/exec.c +1 -0
@@ -23,6 +23,7 @@* formats. */ +#include <linux/kernel_read_file.h> #include <linux/slab.h> #include <linux/file.h> #include <linux/fdtable.h>
include/linux/fs.h +0 -39
@@ -3012,45 +3012,6 @@ static inline void i_readcount_inc(struct inode *inode)#endif extern int do_pipe_flags (int *,int ); -#define __kernel_read_file_id (id) \ - id(UNKNOWN, unknown) \ - id(FIRMWARE, firmware) \ - id(FIRMWARE_PREALLOC_BUFFER, firmware) \ - id(FIRMWARE_EFI_EMBEDDED, firmware) \ - id(MODULE, kernel-module) \ - id(KEXEC_IMAGE, kexec-image) \ - id(KEXEC_INITRAMFS, kexec-initramfs) \ - id(POLICY, security-policy) \ - id(X509_CERTIFICATE, x509-certificate) \ - id(MAX_ID, ) - -#define __fid_enumify (ENUM , dummy) READING_ ## ENUM, -#define __fid_stringify (dummy, str) #str, - -enum kernel_read_file_id { - __kernel_read_file_id(__fid_enumify) -}; - -static const char *const kernel_read_file_str[] = { -__kernel_read_file_id (__fid_stringify) -}; - -static inline const char *kernel_read_file_id_str (enum kernel_read_file_id id) -{ -if ((unsigned )id >=READING_MAX_ID ) -return kernel_read_file_str[READING_UNKNOWN ]; - -return kernel_read_file_str[id]; -} - -extern int kernel_read_file (struct file *,void **,loff_t *,loff_t , -enum kernel_read_file_id ); -extern int kernel_read_file_from_path (const char *,void **,loff_t *,loff_t , -enum kernel_read_file_id ); -extern int kernel_read_file_from_path_initns (const char *,void **,loff_t *,loff_t , -enum kernel_read_file_id ); -extern int kernel_read_file_from_fd (int ,void **,loff_t *,loff_t , -enum kernel_read_file_id );extern ssize_t kernel_read (struct file *,void *,size_t ,loff_t *);extern ssize_t kernel_write (struct file *,const void *,size_t ,loff_t *);extern ssize_t __kernel_write (struct file *,const void *,size_t ,loff_t *);
include/linux/ima.h +1 -0
@@ -7,6 +7,7 @@#ifndef _LINUX_IMA_H#define _LINUX_IMA_H +#include <linux/kernel_read_file.h> #include <linux/fs.h> #include <linux/security.h> #include <linux/kexec.h>
include/linux/kernel_read_file.h new file +52 -0
52 lines not on this page · raw message
include/linux/security.h +1 -0
@@ -23,6 +23,7 @@#ifndef __LINUX_SECURITY_H#define __LINUX_SECURITY_H +#include <linux/kernel_read_file.h> #include <linux/key.h> #include <linux/capability.h> #include <linux/fs.h>
kernel/kexec_file.c +1 -0
@@ -24,6 +24,7 @@#include <linux/elf.h> #include <linux/elfcore.h> #include <linux/kernel.h> +#include <linux/kernel_read_file.h> #include <linux/syscalls.h> #include <linux/vmalloc.h> #include "kexec_internal.h"
kernel/module.c +1 -0
@@ -18,6 +18,7 @@#include <linux/fs.h> #include <linux/sysfs.h> #include <linux/kernel.h> +#include <linux/kernel_read_file.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/elf.h>
security/integrity/digsig.c +1 -0
@@ -10,6 +10,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/cred.h> +#include <linux/kernel_read_file.h> #include <linux/key-type.h> #include <linux/digsig.h> #include <linux/vmalloc.h>
security/integrity/ima/ima_fs.c +1 -0
@@ -13,6 +13,7 @@*/ #include <linux/fcntl.h> +#include <linux/kernel_read_file.h> #include <linux/slab.h> #include <linux/init.h> #include <linux/seq_file.h>
security/integrity/ima/ima_main.c +1 -0
@@ -18,6 +18,7 @@#include <linux/module.h> #include <linux/file.h> #include <linux/binfmts.h> +#include <linux/kernel_read_file.h> #include <linux/mount.h> #include <linux/mman.h> #include <linux/slab.h>
security/integrity/ima/ima_policy.c +1 -0
@@ -9,6 +9,7 @@#include <linux/init.h> #include <linux/list.h> +#include <linux/kernel_read_file.h> #include <linux/fs.h> #include <linux/security.h> #include <linux/magic.h>
security/loadpin/loadpin.c +1 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/fs.h> +#include <linux/kernel_read_file.h> #include <linux/lsm_hooks.h> #include <linux/mount.h> #include <linux/path.h>
security/security.c +1 -0
@@ -16,6 +16,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/kernel_read_file.h> #include <linux/lsm_hooks.h> #include <linux/integrity.h> #include <linux/ima.h>
security/selinux/hooks.c +1 -0
@@ -24,6 +24,7 @@#include <linux/init.h> #include <linux/kd.h> #include <linux/kernel.h> +#include <linux/kernel_read_file.h> #include <linux/tracehook.h> #include <linux/errno.h> #include <linux/sched/signal.h>
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Looks good,
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Hi Al (Viro),
Are you able to take this patch into your tree or does someone else?
Quoted 3 lines · Christoph Hellwig
Looks good,
Reviewed-by Christoph Hellwig <[email protected]>
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 6 lines · Scott Branden
Move kernel_read_file* out of
linux/fs.hto its ownlinux/kernel_read_file.hinclude file. That header gets pulled in just about everywhere and doesn't really need functions not related to the general fs interface.Suggested-by Christoph Hellwig <[email protected]>Signed-off-by Scott Branden <[email protected]>