Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull mudule updates from Rusty Russell: "We get rid of the general module prefix confusion with a binary config option, fix a remove/insert race which Never Happens, and (my favorite) handle the case when we have too many modules for a single commandline. Seriously, the kernel is full, please go away!" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: modpost: fix unwanted VMLINUX_SYMBOL_STR expansion X.509: Support parse long form of length octets in Authority Key Identifier module: don't unlink the module until we've removed all exposure. kernel: kallsyms: memory override issue, need check destination buffer length MODSIGN: do not send garbage to stderr when enabling modules signature modpost: handle huge numbers of modules. modpost: add -T option to read module names from file/stdin. modpost: minor cleanup. genksyms: pass symbol-prefix instead of arch module: fix symbol versioning with symbol prefixes CONFIG_SYMBOL_PREFIX: cleanup.

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull mudule updates from Rusty Russell: "We get rid of the general module prefix confusion with a binary config option, fix a remove/insert race which Never Happens, and (my favorite) handle the case when we have too many modules for a single commandline. Seriously, the kernel is full, please go away!" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: modpost: fix unwanted VMLINUX_SYMBOL_STR expansion X.509: Support parse long form of length octets in Authority Key Identifier module: don't unlink the module until we've removed all exposure. kernel: kallsyms: memory override issue, need check destination buffer length MODSIGN: do not send garbage to stderr when enabling modules signature modpost: handle huge numbers of modules. modpost: add -T option to read module names from file/stdin. modpost: minor cleanup. genksyms: pass symbol-prefix instead of arch module: fix symbol versioning with symbol prefixes CONFIG_SYMBOL_PREFIX: cleanup.
Linus Torvalds
2 parents 24d0c2542b a53a11f357
Showing 23 changed files Side-by-side Diff
Makefile
arch/Kconfig
arch/blackfin/Kconfig
arch/h8300/Kconfig
arch/metag/Kconfig
crypto/asymmetric_keys/x509_cert_parser.c
drivers/mtd/chips/gen_probe.c
include/asm-generic/unistd.h
include/asm-generic/vmlinux.lds.h
include/linux/export.h
include/linux/kernel.h
include/linux/linkage.h
include/linux/module.h
kernel/Makefile
kernel/kallsyms.c
kernel/modsign_certificate.S
kernel/module.c
scripts/Makefile.build
scripts/Makefile.lib
scripts/Makefile.modpost
@@ -1399,7 +1399,7 @@
 # Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
-                   $(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"
+                   $(KERNELRELEASE) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))"
  
 # Create temporary dir for module support files
 # clean it up only when building all modules
@@ -381,6 +381,12 @@
 	  Modules only use ELF REL relocations.  Modules with ELF RELA
 	  relocations will give an error.
  
+config HAVE_UNDERSCORE_SYMBOL_PREFIX
+	bool
+	help
+	  Some architectures generate an _ in front of C symbols; things like
+	  module loading and assembly files need to know about this.
+
 #
 # ABI hall of shame
 #
-config SYMBOL_PREFIX
-	string
-	default "_"
-
 config MMU
 	def_bool n
  
@@ -33,6 +29,7 @@
 	select ARCH_HAVE_CUSTOM_GPIO_H
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select HAVE_UID16
+	select HAVE_UNDERSCORE_SYMBOL_PREFIX
 	select VIRT_TO_BUS
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select HAVE_GENERIC_HARDIRQS
@@ -12,10 +12,7 @@
 	select MODULES_USE_ELF_RELA
 	select OLD_SIGSUSPEND3
 	select OLD_SIGACTION
-
-config SYMBOL_PREFIX
-	string
-	default "_"
+	select HAVE_UNDERSCORE_SYMBOL_PREFIX
  
 config MMU
 	bool
-config SYMBOL_PREFIX
-	string
-	default "_"
-
 config METAG
 	def_bool y
 	select EMBEDDED
@@ -28,6 +24,7 @@
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
 	select HAVE_SYSCALL_TRACEPOINTS
+	select HAVE_UNDERSCORE_SYMBOL_PREFIX
 	select IRQ_DOMAIN
 	select MODULES_USE_ELF_RELA
 	select OF
@@ -373,6 +373,9 @@
 	return 0;
 }
  
+/* The keyIdentifier in AuthorityKeyIdentifier SEQUENCE is tag(CONT,PRIM,0) */
+#define SEQ_TAG_KEYID (ASN1_CONT << 6)
+
 /*
  * Process certificate extensions that are used to qualify the certificate.
  */
  
  
  
  
@@ -407,21 +410,57 @@
 	}
  
 	if (ctx->last_oid == OID_authorityKeyIdentifier) {
+		size_t key_len;
+
 		/* Get hold of the CA key fingerprint */
 		if (vlen < 5)
 			return -EBADMSG;
-		if (v[0] != (ASN1_SEQ | (ASN1_CONS << 5)) ||
-		    v[1] != vlen - 2 ||
-		    v[2] != (ASN1_CONT << 6) ||
-		    v[3] != vlen - 4)
+
+		/* Authority Key Identifier must be a Constructed SEQUENCE */
+		if (v[0] != (ASN1_SEQ | (ASN1_CONS << 5)))
 			return -EBADMSG;
-		v += 4;
-		vlen -= 4;
  
-		f = kmalloc(vlen * 2 + 1, GFP_KERNEL);
+		/* Authority Key Identifier is not indefinite length */
+		if (unlikely(vlen == ASN1_INDEFINITE_LENGTH))
+			return -EBADMSG;
+
+		if (vlen < ASN1_INDEFINITE_LENGTH) {
+			/* Short Form length */
+			if (v[1] != vlen - 2 ||
+			    v[2] != SEQ_TAG_KEYID ||
+			    v[3] > vlen - 4)
+				return -EBADMSG;
+
+			key_len = v[3];
+			v += 4;
+		} else {
+			/* Long Form length */
+			size_t seq_len = 0;
+			size_t sub = v[1] - ASN1_INDEFINITE_LENGTH;
+
+			if (sub > 2)
+				return -EBADMSG;
+
+			/* calculate the length from subsequent octets */
+			v += 2;
+			for (i = 0; i < sub; i++) {
+				seq_len <<= 8;
+				seq_len |= v[i];
+			}
+
+			if (seq_len != vlen - 2 - sub ||
+			    v[sub] != SEQ_TAG_KEYID ||
+			    v[sub + 1] > vlen - 4 - sub)
+				return -EBADMSG;
+
+			key_len = v[sub + 1];
+			v += (sub + 2);
+		}
+
+		f = kmalloc(key_len * 2 + 1, GFP_KERNEL);
 		if (!f)
 			return -ENOMEM;
-		for (i = 0; i < vlen; i++)
+		for (i = 0; i < key_len; i++)
 			sprintf(f + i * 2, "%02x", v[i]);
 		pr_debug("authority   %s\n", f);
 		ctx->cert->authority = f;
@@ -204,14 +204,16 @@
 	struct cfi_private *cfi = map->fldrv_priv;
 	__u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
 #ifdef CONFIG_MODULES
-	char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];
+	char probename[sizeof(VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X))];
 	cfi_cmdset_fn_t *probe_function;
  
-	sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);
+	sprintf(probename, VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X), type);
  
 	probe_function = __symbol_get(probename);
 	if (!probe_function) {
-		request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);
+		char modname[sizeof("cfi_cmdset_%4.4X")];
+		sprintf(modname, "cfi_cmdset_%4.4X", type);
+		request_module(modname);
 		probe_function = __symbol_get(probename);
 	}
  
 #include <uapi/asm-generic/unistd.h>
+#include <linux/export.h>
  
 /*
  * These are required system calls, we should
@@ -52,13 +52,7 @@
 #define LOAD_OFFSET 0
 #endif
  
-#ifndef SYMBOL_PREFIX
-#define VMLINUX_SYMBOL(sym) sym
-#else
-#define PASTE2(x,y) x##y
-#define PASTE(x,y) PASTE2(x,y)
-#define VMLINUX_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
-#endif
+#include <linux/export.h>
  
 /* Align . to a 8 byte boundary equals to maximum function alignment. */
 #define ALIGN_FUNCTION()  . = ALIGN(8)
@@ -5,17 +5,24 @@
  * to reduce the amount of pointless cruft we feed to gcc when only
  * exporting a simple symbol or two.
  *
- * If you feel the need to add #include <linux/foo.h> to this file
- * then you are doing something wrong and should go away silently.
+ * Try not to add #includes here.  It slows compilation and makes kernel
+ * hackers place grumpy comments in header files.
  */
  
 /* Some toolchains use a `_' prefix for all user symbols. */
-#ifdef CONFIG_SYMBOL_PREFIX
-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
+#define __VMLINUX_SYMBOL(x) _##x
+#define __VMLINUX_SYMBOL_STR(x) "_" #x
 #else
-#define MODULE_SYMBOL_PREFIX ""
+#define __VMLINUX_SYMBOL(x) x
+#define __VMLINUX_SYMBOL_STR(x) #x
 #endif
  
+/* Indirect, so macros are expanded before pasting. */
+#define VMLINUX_SYMBOL(x) __VMLINUX_SYMBOL(x)
+#define VMLINUX_SYMBOL_STR(x) __VMLINUX_SYMBOL_STR(x)
+
+#ifndef __ASSEMBLY__
 struct kernel_symbol
 {
 	unsigned long value;
@@ -51,7 +58,7 @@
 	__CRC_SYMBOL(sym, sec)					\
 	static const char __kstrtab_##sym[]			\
 	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-	= MODULE_SYMBOL_PREFIX #sym;				\
+	= VMLINUX_SYMBOL_STR(sym);				\
 	static const struct kernel_symbol __ksymtab_##sym	\
 	__used							\
 	__attribute__((section("___ksymtab" sec "+" #sym), unused))	\
@@ -85,6 +92,7 @@
 #define EXPORT_UNUSED_SYMBOL_GPL(sym)
  
 #endif /* CONFIG_MODULES */
+#endif /* !__ASSEMBLY__ */
  
 #endif /* _LINUX_EXPORT_H */
@@ -786,13 +786,6 @@
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)
  
-/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */
-#ifdef CONFIG_SYMBOL_PREFIX
-#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
-#else
-#define SYMBOL_PREFIX ""
-#endif
-
 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
@@ -3,6 +3,7 @@
  
 #include <linux/compiler.h>
 #include <linux/stringify.h>
+#include <linux/export.h>
 #include <asm/linkage.h>
  
 #ifdef __cplusplus
  
  
@@ -15,21 +16,18 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
  
-#ifdef CONFIG_SYMBOL_PREFIX
-#define __SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX __stringify(x)
-#else
-#define __SYMBOL_NAME(x) __stringify(x)
-#endif
-
 #ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \
-	"\n\t.set\t" __SYMBOL_NAME(x) "," __SYMBOL_NAME(sys_ni_syscall));
+#define cond_syscall(x)	asm(				\
+	".weak " VMLINUX_SYMBOL_STR(x) "\n\t"		\
+	".set  " VMLINUX_SYMBOL_STR(x) ","		\
+		 VMLINUX_SYMBOL_STR(sys_ni_syscall))
 #endif
  
 #ifndef SYSCALL_ALIAS
-#define SYSCALL_ALIAS(alias, name)				\
-	asm ("\t.globl " __SYMBOL_NAME(alias)			\
-	"\n\t.set\t" __SYMBOL_NAME(alias) "," __SYMBOL_NAME(name))
+#define SYSCALL_ALIAS(alias, name) asm(			\
+	".globl " VMLINUX_SYMBOL_STR(alias) "\n\t"	\
+	".set   " VMLINUX_SYMBOL_STR(alias) ","		\
+		  VMLINUX_SYMBOL_STR(name))
 #endif
  
 #define __page_aligned_data	__section(.data..page_aligned) __aligned(PAGE_SIZE)
@@ -190,7 +190,7 @@
 /* Get/put a kernel symbol (calls must be symmetric) */
 void *__symbol_get(const char *symbol);
 void *__symbol_get_gpl(const char *symbol);
-#define symbol_get(x) ((typeof(&x))(__symbol_get(MODULE_SYMBOL_PREFIX #x)))
+#define symbol_get(x) ((typeof(&x))(__symbol_get(VMLINUX_SYMBOL_STR(x))))
  
 /* modules using other modules: kdb wants to see this. */
 struct module_use {
@@ -453,7 +453,7 @@
 #ifdef CONFIG_MODULE_UNLOAD
 unsigned long module_refcount(struct module *mod);
 void __symbol_put(const char *symbol);
-#define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x)
+#define symbol_put(x) __symbol_put(VMLINUX_SYMBOL_STR(x))
 void symbol_put_addr(void *addr);
  
 /* Sometimes we know we already have a refcount, and it's easier not
@@ -176,7 +176,7 @@
 	openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \
 		-batch -x509 -config x509.genkey \
 		-outform DER -out signing_key.x509 \
-		-keyout signing_key.priv
+		-keyout signing_key.priv 2>&1
 	@echo "###"
 	@echo "### Key pair generated."
 	@echo "###"
@@ -84,9 +84,11 @@
  
 /*
  * Expand a compressed symbol data into the resulting uncompressed string,
+ * if uncompressed string is too long (>= maxlen), it will be truncated,
  * given the offset to where the symbol is in the compressed stream.
  */
-static unsigned int kallsyms_expand_symbol(unsigned int off, char *result)
+static unsigned int kallsyms_expand_symbol(unsigned int off,
+					   char *result, size_t maxlen)
 {
 	int len, skipped_first = 0;
 	const u8 *tptr, *data;
  
  
@@ -113,15 +115,20 @@
  
 		while (*tptr) {
 			if (skipped_first) {
+				if (maxlen <= 1)
+					goto tail;
 				*result = *tptr;
 				result++;
+				maxlen--;
 			} else
 				skipped_first = 1;
 			tptr++;
 		}
 	}
  
-	*result = '\0';
+tail:
+	if (maxlen)
+		*result = '\0';
  
 	/* Return to offset to the next symbol. */
 	return off;
@@ -176,7 +183,7 @@
 	unsigned int off;
  
 	for (i = 0, off = 0; i < kallsyms_num_syms; i++) {
-		off = kallsyms_expand_symbol(off, namebuf);
+		off = kallsyms_expand_symbol(off, namebuf, ARRAY_SIZE(namebuf));
  
 		if (strcmp(namebuf, name) == 0)
 			return kallsyms_addresses[i];
@@ -195,7 +202,7 @@
 	int ret;
  
 	for (i = 0, off = 0; i < kallsyms_num_syms; i++) {
-		off = kallsyms_expand_symbol(off, namebuf);
+		off = kallsyms_expand_symbol(off, namebuf, ARRAY_SIZE(namebuf));
 		ret = fn(data, namebuf, NULL, kallsyms_addresses[i]);
 		if (ret != 0)
 			return ret;
@@ -294,7 +301,8 @@
  
 		pos = get_symbol_pos(addr, symbolsize, offset);
 		/* Grab name */
-		kallsyms_expand_symbol(get_symbol_offset(pos), namebuf);
+		kallsyms_expand_symbol(get_symbol_offset(pos),
+				       namebuf, KSYM_NAME_LEN);
 		if (modname)
 			*modname = NULL;
 		return namebuf;
@@ -315,7 +323,8 @@
  
 		pos = get_symbol_pos(addr, NULL, NULL);
 		/* Grab name */
-		kallsyms_expand_symbol(get_symbol_offset(pos), symname);
+		kallsyms_expand_symbol(get_symbol_offset(pos),
+				       symname, KSYM_NAME_LEN);
 		return 0;
 	}
 	/* See if it's in a module. */
@@ -333,7 +342,8 @@
  
 		pos = get_symbol_pos(addr, size, offset);
 		/* Grab name */
-		kallsyms_expand_symbol(get_symbol_offset(pos), name);
+		kallsyms_expand_symbol(get_symbol_offset(pos),
+				       name, KSYM_NAME_LEN);
 		modname[0] = '\0';
 		return 0;
 	}
@@ -463,7 +473,7 @@
  
 	iter->type = kallsyms_get_symbol_type(off);
  
-	off = kallsyms_expand_symbol(off, iter->name);
+	off = kallsyms_expand_symbol(off, iter->name, ARRAY_SIZE(iter->name));
  
 	return off - iter->nameoff;
 }
-/* SYMBOL_PREFIX defined on commandline from CONFIG_SYMBOL_PREFIX */
-#ifndef SYMBOL_PREFIX
-#define ASM_SYMBOL(sym) sym
-#else
-#define PASTE2(x,y) x##y
-#define PASTE(x,y) PASTE2(x,y)
-#define ASM_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
-#endif
+#include <linux/export.h>
  
 #define GLOBAL(name)	\
-	.globl ASM_SYMBOL(name);	\
-	ASM_SYMBOL(name):
+	.globl VMLINUX_SYMBOL(name);	\
+	VMLINUX_SYMBOL(name):
  
 	.section ".init.data","aw"
  
@@ -1209,10 +1209,11 @@
  
 	/* Since this should be found in kernel (which can't be removed),
 	 * no locking is necessary. */
-	if (!find_symbol(MODULE_SYMBOL_PREFIX "module_layout", NULL,
+	if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL,
 			 &crc, true, false))
 		BUG();
-	return check_version(sechdrs, versindex, "module_layout", mod, crc,
+	return check_version(sechdrs, versindex,
+			     VMLINUX_SYMBOL_STR(module_layout), mod, crc,
 			     NULL);
 }
  
  
@@ -1861,12 +1862,12 @@
 {
 	trace_module_free(mod);
  
-	/* Delete from various lists */
-	mutex_lock(&module_mutex);
-	stop_machine(__unlink_module, mod, NULL);
-	mutex_unlock(&module_mutex);
 	mod_sysfs_teardown(mod);
  
+	/* We leave it in list to prevent duplicate loads, but make sure
+	 * that noone uses it while it's being deconstructed. */
+	mod->state = MODULE_STATE_UNFORMED;
+
 	/* Remove dynamic debug info */
 	ddebug_remove_module(mod->name);
  
@@ -1878,6 +1879,11 @@
  
 	/* Free any allocated parameters. */
 	destroy_params(mod->kp, mod->num_kp);
+
+	/* Now we can delete it from the lists */
+	mutex_lock(&module_mutex);
+	stop_machine(__unlink_module, mod, NULL);
+	mutex_unlock(&module_mutex);
  
 	/* This may be NULL, but that's OK */
 	unset_module_init_ro_nx(mod);
@@ -211,7 +211,8 @@
  
 cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH)                              \
+    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
  
@@ -119,13 +119,6 @@
 		$(CFLAGS_GCOV))
 endif
  
-ifdef CONFIG_SYMBOL_PREFIX
-_sym_flags = -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
-_cpp_flags += $(_sym_flags)
-_a_flags += $(_sym_flags)
-endif
-
-
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
  
@@ -60,7 +60,8 @@
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
  
 # Step 1), find all modules listed in $(MODVERDIR)/
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
+__modules := $(shell $(MODLISTCMD))
 modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
  
 # Stop after building .o files if NOFINAL is set. Makes compile tests quicker
  
  
@@ -78,12 +79,13 @@
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
  
+# We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(modpost) -s
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
  
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
-	$(call cmd,modpost) $(wildcard vmlinux) $(filter-out FORCE,$^)
+	$(call cmd,modpost) $(wildcard vmlinux)
  
 quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
@@ -45,7 +45,6 @@
  
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
 	   flag_preserve, flag_warnings;
-static const char *arch = "";
 static const char *mod_prefix = "";
  
 static int errors;
@@ -731,7 +730,7 @@
 {
 	fputs("Usage:\n" "genksyms [-adDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
 #ifdef __GNU_LIBRARY__
-	      "  -a, --arch            Select architecture\n"
+	      "  -s, --symbol-prefix   Select symbol prefix\n"
 	      "  -d, --debug           Increment the debug level (repeatable)\n"
 	      "  -D, --dump            Dump expanded symbol defs (for debugging only)\n"
 	      "  -r, --reference file  Read reference symbols from a file\n"
@@ -742,7 +741,7 @@
 	      "  -h, --help            Print this message\n"
 	      "  -V, --version         Print the release version\n"
 #else				/* __GNU_LIBRARY__ */
-	      "  -a                    Select architecture\n"
+	      "  -s                    Select symbol prefix\n"
 	      "  -d                    Increment the debug level (repeatable)\n"
 	      "  -D                    Dump expanded symbol defs (for debugging only)\n"
 	      "  -r file               Read reference symbols from a file\n"
@@ -763,7 +762,7 @@
  
 #ifdef __GNU_LIBRARY__
 	struct option long_opts[] = {
-		{"arch", 1, 0, 'a'},
+		{"symbol-prefix", 1, 0, 's'},
 		{"debug", 0, 0, 'd'},
 		{"warnings", 0, 0, 'w'},
 		{"quiet", 0, 0, 'q'},
  
  
@@ -776,14 +775,14 @@
 		{0, 0, 0, 0}
 	};
  
-	while ((o = getopt_long(argc, argv, "a:dwqVDr:T:ph",
+	while ((o = getopt_long(argc, argv, "s:dwqVDr:T:ph",
 				&long_opts[0], NULL)) != EOF)
 #else				/* __GNU_LIBRARY__ */
-	while ((o = getopt(argc, argv, "a:dwqVDr:T:ph")) != EOF)
+	while ((o = getopt(argc, argv, "s:dwqVDr:T:ph")) != EOF)
 #endif				/* __GNU_LIBRARY__ */
 		switch (o) {
-		case 'a':
-			arch = optarg;
+		case 's':
+			mod_prefix = optarg;
 			break;
 		case 'd':
 			flag_debug++;
@@ -826,9 +825,6 @@
 			genksyms_usage();
 			return 1;
 		}
-	if ((strcmp(arch, "h8300") == 0) || (strcmp(arch, "blackfin") == 0) ||
-	    (strcmp(arch, "metag") == 0))
-		mod_prefix = "_";
 	{
 		extern int yydebug;
 		extern int yy_flex_debug;
@@ -74,9 +74,8 @@
 	info KSYM ${2}
 	local kallsymopt;
  
-	if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
-		kallsymopt="${kallsymopt} \
-			    --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
+	if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
+		kallsymopt="${kallsymopt} --symbol-prefix=_"
 	fi
  
 	if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
@@ -15,18 +15,13 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <limits.h>
+#include <stdbool.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
+#include "../../include/linux/export.h"
  
-/* Some toolchains use a `_' prefix for all user symbols. */
-#ifdef CONFIG_SYMBOL_PREFIX
-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
-#else
-#define MODULE_SYMBOL_PREFIX ""
-#endif
-
-
 /* Are we using CONFIG_MODVERSIONS? */
 int modversions = 0;
 /* Warn about undefined symbols? (do so if we have vmlinux) */
@@ -85,6 +80,14 @@
 	va_end(arglist);
 }
  
+static inline bool strends(const char *str, const char *postfix)
+{
+	if (strlen(str) < strlen(postfix))
+		return false;
+
+	return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
+}
+
 static int is_vmlinux(const char *modname)
 {
 	const char *myname;
  
  
@@ -120,22 +123,20 @@
 	return mod;
 }
  
-static struct module *new_module(char *modname)
+static struct module *new_module(const char *modname)
 {
 	struct module *mod;
-	char *p, *s;
+	char *p;
  
 	mod = NOFAIL(malloc(sizeof(*mod)));
 	memset(mod, 0, sizeof(*mod));
 	p = NOFAIL(strdup(modname));
  
 	/* strip trailing .o */
-	s = strrchr(p, '.');
-	if (s != NULL)
-		if (strcmp(s, ".o") == 0) {
-			*s = '\0';
-			mod->is_dot_o = 1;
-		}
+	if (strends(p, ".o")) {
+		p[strlen(p) - 2] = '\0';
+		mod->is_dot_o = 1;
+	}
  
 	/* add to list */
 	mod->name = p;
@@ -562,7 +563,7 @@
 static int ignore_undef_symbol(struct elf_info *info, const char *symname)
 {
 	/* ignore __this_module, it will be resolved shortly */
-	if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+	if (strcmp(symname, VMLINUX_SYMBOL_STR(__this_module)) == 0)
 		return 1;
 	/* ignore global offset table */
 	if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
@@ -583,8 +584,8 @@
 	return 0;
 }
  
-#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
-#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
+#define CRC_PFX     VMLINUX_SYMBOL_STR(__crc_)
+#define KSYMTAB_PFX VMLINUX_SYMBOL_STR(__ksymtab_)
  
 static void handle_modversions(struct module *mod, struct elf_info *info,
 			       Elf_Sym *sym, const char *symname)
@@ -637,14 +638,15 @@
 		}
 #endif
  
-		if (memcmp(symname, MODULE_SYMBOL_PREFIX,
-			   strlen(MODULE_SYMBOL_PREFIX)) == 0) {
-			mod->unres =
-			  alloc_symbol(symname +
-			               strlen(MODULE_SYMBOL_PREFIX),
-			               ELF_ST_BIND(sym->st_info) == STB_WEAK,
-			               mod->unres);
-		}
+#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
+		if (symname[0] != '_')
+			break;
+		else
+			symname++;
+#endif
+		mod->unres = alloc_symbol(symname,
+					  ELF_ST_BIND(sym->st_info) == STB_WEAK,
+					  mod->unres);
 		break;
 	default:
 		/* All exported symbols */
  
@@ -652,9 +654,9 @@
 			sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
 					export);
 		}
-		if (strcmp(symname, MODULE_SYMBOL_PREFIX "init_module") == 0)
+		if (strcmp(symname, VMLINUX_SYMBOL_STR(init_module)) == 0)
 			mod->has_init = 1;
-		if (strcmp(symname, MODULE_SYMBOL_PREFIX "cleanup_module") == 0)
+		if (strcmp(symname, VMLINUX_SYMBOL_STR(cleanup_module)) == 0)
 			mod->has_cleanup = 1;
 		break;
 	}
@@ -1762,6 +1764,27 @@
 		mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
  
+static void read_symbols_from_files(const char *filename)
+{
+	FILE *in = stdin;
+	char fname[PATH_MAX];
+
+	if (strcmp(filename, "-") != 0) {
+		in = fopen(filename, "r");
+		if (!in)
+			fatal("Can't open filenames file %s: %m", filename);
+	}
+
+	while (fgets(fname, PATH_MAX, in) != NULL) {
+		if (strends(fname, "\n"))
+			fname[strlen(fname)-1] = '\0';
+		read_symbols(fname);
+	}
+
+	if (in != stdin)
+		fclose(in);
+}
+
 #define SZ 500
  
 /* We first write the generated file into memory using the
@@ -1934,7 +1957,8 @@
 				s->name, mod->name);
 			continue;
 		}
-		buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name);
+		buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
+			   s->crc, s->name);
 	}
  
 	buf_printf(b, "};\n");
  
@@ -2122,13 +2146,13 @@
 	struct module *mod;
 	struct buffer buf = { };
 	char *kernel_read = NULL, *module_read = NULL;
-	char *dump_write = NULL;
+	char *dump_write = NULL, *files_source = NULL;
 	int opt;
 	int err;
 	struct ext_sym_list *extsym_iter;
 	struct ext_sym_list *extsym_start = NULL;
  
-	while ((opt = getopt(argc, argv, "i:I:e:msSo:awM:K:")) != -1) {
+	while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
 		switch (opt) {
 		case 'i':
 			kernel_read = optarg;
@@ -2160,6 +2184,9 @@
 		case 'S':
 			sec_mismatch_verbose = 0;
 			break;
+		case 'T':
+			files_source = optarg;
+			break;
 		case 'w':
 			warn_unresolved = 1;
 			break;
@@ -2181,6 +2208,9 @@
  
 	while (optind < argc)
 		read_symbols(argv[optind++]);
+
+	if (files_source)
+		read_symbols_from_files(files_source);
  
 	for (mod = modules; mod; mod = mod->next) {
 		if (mod->skip)
...	...	@@ -1399,7 +1399,7 @@
1399	1399	# Run depmod only if we have System.map and depmod is executable
1400	1400	quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
1401	1401	cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
1402		- $(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"
	1402	+ $(KERNELRELEASE) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))"
1403	1403
1404	1404	# Create temporary dir for module support files
1405	1405	# clean it up only when building all modules
...	...	@@ -381,6 +381,12 @@
381	381	Modules only use ELF REL relocations. Modules with ELF RELA
382	382	relocations will give an error.
383	383
	384	+config HAVE_UNDERSCORE_SYMBOL_PREFIX
	385	+ bool
	386	+ help
	387	+ Some architectures generate an _ in front of C symbols; things like
	388	+ module loading and assembly files need to know about this.
	389	+
384	390	#
385	391	# ABI hall of shame
386	392	#
1		-config SYMBOL_PREFIX
2		- string
3		- default "_"
4		-
5	1	config MMU
6	2	def_bool n
7	3
...	...	@@ -33,6 +29,7 @@
33	29	select ARCH_HAVE_CUSTOM_GPIO_H
34	30	select ARCH_WANT_OPTIONAL_GPIOLIB
35	31	select HAVE_UID16
	32	+ select HAVE_UNDERSCORE_SYMBOL_PREFIX
36	33	select VIRT_TO_BUS
37	34	select ARCH_WANT_IPC_PARSE_VERSION
38	35	select HAVE_GENERIC_HARDIRQS
...	...	@@ -12,10 +12,7 @@
12	12	select MODULES_USE_ELF_RELA
13	13	select OLD_SIGSUSPEND3
14	14	select OLD_SIGACTION
15		-
16		-config SYMBOL_PREFIX
17		- string
18		- default "_"
	15	+ select HAVE_UNDERSCORE_SYMBOL_PREFIX
19	16
20	17	config MMU
21	18	bool
...	...	@@ -373,6 +373,9 @@
373	373	return 0;
374	374	}
375	375
	376	+/* The keyIdentifier in AuthorityKeyIdentifier SEQUENCE is tag(CONT,PRIM,0) */
	377	+#define SEQ_TAG_KEYID (ASN1_CONT << 6)
	378	+
376	379	/*
377	380	* Process certificate extensions that are used to qualify the certificate.
378	381	*/
379	382
380	383
381	384
382	385
...	...	@@ -407,21 +410,57 @@
407	410	}
408	411
409	412	if (ctx->last_oid == OID_authorityKeyIdentifier) {
	413	+ size_t key_len;
	414	+
410	415	/* Get hold of the CA key fingerprint */
411	416	if (vlen < 5)
412	417	return -EBADMSG;
413		- if (v[0] != (ASN1_SEQ \| (ASN1_CONS << 5)) \|\|
414		- v[1] != vlen - 2 \|\|
415		- v[2] != (ASN1_CONT << 6) \|\|
416		- v[3] != vlen - 4)
	418	+
	419	+ /* Authority Key Identifier must be a Constructed SEQUENCE */
	420	+ if (v[0] != (ASN1_SEQ \| (ASN1_CONS << 5)))
417	421	return -EBADMSG;
418		- v += 4;
419		- vlen -= 4;
420	422
421		- f = kmalloc(vlen * 2 + 1, GFP_KERNEL);
	423	+ /* Authority Key Identifier is not indefinite length */
	424	+ if (unlikely(vlen == ASN1_INDEFINITE_LENGTH))
	425	+ return -EBADMSG;
	426	+
	427	+ if (vlen < ASN1_INDEFINITE_LENGTH) {
	428	+ /* Short Form length */
	429	+ if (v[1] != vlen - 2 \|\|
	430	+ v[2] != SEQ_TAG_KEYID \|\|
	431	+ v[3] > vlen - 4)
	432	+ return -EBADMSG;
	433	+
	434	+ key_len = v[3];
	435	+ v += 4;
	436	+ } else {
	437	+ /* Long Form length */
	438	+ size_t seq_len = 0;
	439	+ size_t sub = v[1] - ASN1_INDEFINITE_LENGTH;
	440	+
	441	+ if (sub > 2)
	442	+ return -EBADMSG;
	443	+
	444	+ /* calculate the length from subsequent octets */
	445	+ v += 2;
	446	+ for (i = 0; i < sub; i++) {
	447	+ seq_len <<= 8;
	448	+ seq_len \|= v[i];
	449	+ }
	450	+
	451	+ if (seq_len != vlen - 2 - sub \|\|
	452	+ v[sub] != SEQ_TAG_KEYID \|\|
	453	+ v[sub + 1] > vlen - 4 - sub)
	454	+ return -EBADMSG;
	455	+
	456	+ key_len = v[sub + 1];
	457	+ v += (sub + 2);
	458	+ }
	459	+
	460	+ f = kmalloc(key_len * 2 + 1, GFP_KERNEL);
422	461	if (!f)
423	462	return -ENOMEM;
424		- for (i = 0; i < vlen; i++)
	463	+ for (i = 0; i < key_len; i++)
425	464	sprintf(f + i * 2, "%02x", v[i]);
426	465	pr_debug("authority %s\n", f);
427	466	ctx->cert->authority = f;
...	...	@@ -204,14 +204,16 @@
204	204	struct cfi_private *cfi = map->fldrv_priv;
205	205	__u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
206	206	#ifdef CONFIG_MODULES
207		- char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];
	207	+ char probename[sizeof(VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X))];
208	208	cfi_cmdset_fn_t *probe_function;
209	209
210		- sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);
	210	+ sprintf(probename, VMLINUX_SYMBOL_STR(cfi_cmdset_%4.4X), type);
211	211
212	212	probe_function = __symbol_get(probename);
213	213	if (!probe_function) {
214		- request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);
	214	+ char modname[sizeof("cfi_cmdset_%4.4X")];
	215	+ sprintf(modname, "cfi_cmdset_%4.4X", type);
	216	+ request_module(modname);
215	217	probe_function = __symbol_get(probename);
216	218	}
217	219
1	1	#include <uapi/asm-generic/unistd.h>
	2	+#include <linux/export.h>
2	3
3	4	/*
4	5	* These are required system calls, we should
...	...	@@ -52,13 +52,7 @@
52	52	#define LOAD_OFFSET 0
53	53	#endif
54	54
55		-#ifndef SYMBOL_PREFIX
56		-#define VMLINUX_SYMBOL(sym) sym
57		-#else
58		-#define PASTE2(x,y) x##y
59		-#define PASTE(x,y) PASTE2(x,y)
60		-#define VMLINUX_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
61		-#endif
	55	+#include <linux/export.h>
62	56
63	57	/* Align . to a 8 byte boundary equals to maximum function alignment. */
64	58	#define ALIGN_FUNCTION() . = ALIGN(8)
...	...	@@ -5,17 +5,24 @@
5	5	* to reduce the amount of pointless cruft we feed to gcc when only
6	6	* exporting a simple symbol or two.
7	7	*
8		- * If you feel the need to add #include <linux/foo.h> to this file
9		- * then you are doing something wrong and should go away silently.
	8	+ * Try not to add #includes here. It slows compilation and makes kernel
	9	+ * hackers place grumpy comments in header files.
10	10	*/
11	11
12	12	/* Some toolchains use a `_' prefix for all user symbols. */
13		-#ifdef CONFIG_SYMBOL_PREFIX
14		-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
	13	+#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
	14	+#define __VMLINUX_SYMBOL(x) _##x
	15	+#define __VMLINUX_SYMBOL_STR(x) "_" #x
15	16	#else
16		-#define MODULE_SYMBOL_PREFIX ""
	17	+#define __VMLINUX_SYMBOL(x) x
	18	+#define __VMLINUX_SYMBOL_STR(x) #x
17	19	#endif
18	20
	21	+/* Indirect, so macros are expanded before pasting. */
	22	+#define VMLINUX_SYMBOL(x) __VMLINUX_SYMBOL(x)
	23	+#define VMLINUX_SYMBOL_STR(x) __VMLINUX_SYMBOL_STR(x)
	24	+
	25	+#ifndef __ASSEMBLY__
19	26	struct kernel_symbol
20	27	{
21	28	unsigned long value;
...	...	@@ -51,7 +58,7 @@
51	58	__CRC_SYMBOL(sym, sec) \
52	59	static const char __kstrtab_##sym[] \
53	60	__attribute__((section("__ksymtab_strings"), aligned(1))) \
54		- = MODULE_SYMBOL_PREFIX #sym; \
	61	+ = VMLINUX_SYMBOL_STR(sym); \
55	62	static const struct kernel_symbol __ksymtab_##sym \
56	63	__used \
57	64	__attribute__((section("___ksymtab" sec "+" #sym), unused)) \
...	...	@@ -85,6 +92,7 @@
85	92	#define EXPORT_UNUSED_SYMBOL_GPL(sym)
86	93
87	94	#endif /* CONFIG_MODULES */
	95	+#endif /* !__ASSEMBLY__ */
88	96
89	97	#endif /* _LINUX_EXPORT_H */
...	...	@@ -786,13 +786,6 @@
786	786	/* Trap pasters of __FUNCTION__ at compile-time */
787	787	#define __FUNCTION__ (__func__)
788	788
789		-/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */
790		-#ifdef CONFIG_SYMBOL_PREFIX
791		-#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
792		-#else
793		-#define SYMBOL_PREFIX ""
794		-#endif
795		-
796	789	/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
797	790	#ifdef CONFIG_FTRACE_MCOUNT_RECORD
798	791	# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD