Commit b89999d0 authored by Scott Branden's avatar Scott Branden Committed by Greg Kroah-Hartman
Browse files

fs/kernel_read_file: Split into separate 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.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarScott Branden <scott.branden@broadcom.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarJames Morris <jamorris@linux.microsoft.com>
Link: https://lore.kernel.org/r/20200706232309.12010-2-scott.branden@broadcom.com
Link: https://lore.kernel.org/r/20201002173828.2099543-4-keescook@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06e67b84

drivers/base/firmware_loader/main.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 −38
Original line number Diff line number Diff line
@@ -2858,44 +2858,6 @@ static inline void i_readcount_inc(struct inode *inode) 
#endif

extern int do_pipe_flags(int *, int);



/* This is a list of *what* is being read, not *how* nor *where*. */

#define __kernel_read_file_id(id) \

	id(UNKNOWN, unknown)		\

	id(FIRMWARE, 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 *);

ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos);

extern ssize_t kernel_write(struct file *, const void *, size_t, loff_t *);

include/linux/ima.h

+1 −0
Original line number Diff line number Diff line
@@ -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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_KERNEL_READ_FILE_H

#define _LINUX_KERNEL_READ_FILE_H



#include <linux/file.h>

#include <linux/types.h>



/* This is a list of *what* is being read, not *how* nor *where*. */

#define __kernel_read_file_id(id) \

	id(UNKNOWN, unknown)		\

	id(FIRMWARE, 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 int)id >= READING_MAX_ID)

		return kernel_read_file_str[READING_UNKNOWN];



	return kernel_read_file_str[id];

}



int kernel_read_file(struct file *file,

		     void **buf, loff_t *size, loff_t max_size,

		     enum kernel_read_file_id id);

int kernel_read_file_from_path(const char *path,

			       void **buf, loff_t *size, loff_t max_size,

			       enum kernel_read_file_id id);

int kernel_read_file_from_path_initns(const char *path,

				      void **buf, loff_t *size, loff_t max_size,

				      enum kernel_read_file_id id);

int kernel_read_file_from_fd(int fd,

			     void **buf, loff_t *size, loff_t max_size,

			     enum kernel_read_file_id id);



#endif /* _LINUX_KERNEL_READ_FILE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE