Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1383784

[PATCH 5/6] fs: define a string representation of the kernel_read_file_id enumeration

Show all headers | View raw

From: Mimi Zohar <zohar@linux.vnet.ibm.com>

A string representation of the kernel_read_file_id enumeration is
needed for displaying messages (eg. pr_info, auditing) that can be
used by multiple LSMs and the integrity subsystem.  To simplify
keeping the list of strings up to date with the enumeration, this
patch defines two new preprocessing macros named __fid_enumify and
__fid_stringify to create the enumeration and an array of strings.
kernel_read_file_id_str() returns a string based on the enumeration.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
[kees: removed removal of my old version, constified pointer values]
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 include/linux/fs.h | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 70e61b58baaf..518716b4834e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2590,15 +2590,34 @@ 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(MODULE, kernel-module)		\
+	id(KEXEC_IMAGE, kexec-image)		\
+	id(KEXEC_INITRAMFS, kexec-initramfs)	\
+	id(POLICY, security-policy)		\
+	id(MAX_ID, )
+
+#define __fid_enumify(ENUM, dummy) READING_ ## ENUM,
+#define __fid_stringify(dummy, str) #str,
+
 enum kernel_read_file_id {
-	READING_FIRMWARE = 1,
-	READING_MODULE,
-	READING_KEXEC_IMAGE,
-	READING_KEXEC_INITRAMFS,
-	READING_POLICY,
-	READING_MAX_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 * const kernel_read_file_id_str(enum kernel_read_file_id id)
+{
+	if (id < 0 || id >= READING_MAX_ID)
+		return kernel_read_file_str[READING_UNKNOWN];
+
+	return kernel_read_file_str[id];
+}
+
 extern int kernel_read(struct file *, loff_t, char *, unsigned long);
 extern int kernel_read_file(struct file *, void **, loff_t *, loff_t,
 			    enum kernel_read_file_id);
-- 
2.6.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 0/6] LSM: LoadPin for kernel file loading restrictions Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
  [PATCH 2/6] string_helpers: add kstrdup_quotable_cmdline Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
  [PATCH 6/6] LSM: LoadPin for kernel file loading restrictions Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
  [PATCH 3/6] string_helpers: add kstrdup_quotable_file Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
  [PATCH 4/6] Yama: consolidate error reporting Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
  [PATCH 5/6] fs: define a string representation of the kernel_read_file_id enumeration Kees Cook <keescook@chromium.org> - 2016-04-21 00:50 +0200
    Re: [PATCH 5/6] fs: define a string representation of the  kernel_read_file_id enumeration Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-04-21 15:30 +0200
      Re: [PATCH 5/6] fs: define a string representation of the  kernel_read_file_id enumeration Kees Cook <keescook@chromium.org> - 2016-04-21 18:50 +0200
        Re: [PATCH 5/6] fs: define a string representation of the  kernel_read_file_id enumeration Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-04-21 19:20 +0200
  Re: [PATCH v5 0/6] LSM: LoadPin for kernel file loading  restrictions James Morris <jmorris@namei.org> - 2016-04-21 02:30 +0200

csiph-web