[PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: 2015-09-14 22:51:14
Also in:
linux-api, linux-arch
Subsystem:
exec & binfmt api, elf, filesystems (vfs and infrastructure), the rest · Maintainers:
Kees Cook, Alexander Viro, Christian Brauner, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2015-11-03 · [PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c · Palmer Dabbelt <hidden>
- 2015-11-03 · [PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c · Palmer Dabbelt <hidden>
- 2015-09-14 · [PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c · Palmer Dabbelt <hidden>
- 2015-09-14 · [PATCH 08/13] Move MAX_SHARED_LIBS to fs/binfmt_flat.c · Palmer Dabbelt <hidden>
I'm not sure what this is, but it doesn't feel like something that should be exposed to userspace here. I'm assuming this file was exposed for the structure in it, which doesn't depend on MAX_SHARED_LIBS. Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com> Reviewed-by: Andrew Waterman <redacted> Reviewed-by: Albert Ou <aou@eecs.berkeley.edu> --- fs/binfmt_flat.c | 6 ++++++ include/uapi/linux/flat.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index f723cd3a455c..e89fb43c2a10 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c@@ -72,6 +72,12 @@ #define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */ #define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */ +#ifdef CONFIG_BINFMT_SHARED_FLAT +#define MAX_SHARED_LIBS (4) +#else +#define MAX_SHARED_LIBS (1) +#endif + struct lib_info { struct { unsigned long start_code; /* Start of text segment */
diff --git a/include/uapi/linux/flat.h b/include/uapi/linux/flat.h
index 88cd6baba8f3..1b177c7637c4 100644
--- a/include/uapi/linux/flat.h
+++ b/include/uapi/linux/flat.h@@ -13,12 +13,6 @@ #define FLAT_VERSION 0x00000004L -#ifdef CONFIG_BINFMT_SHARED_FLAT -#define MAX_SHARED_LIBS (4) -#else -#define MAX_SHARED_LIBS (1) -#endif - /* * To make everything easier to port and manage cross platform * development, all fields are in network byte order.
--
2.4.6