Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c2545ee authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files

module: put modversions in vermagic 



Don't allow a module built without versions altogether to be inserted
into a kernel which expects modversions.

modprobe --force will strip vermagic as well as modversions, so it
won't be effected, but this will make sure that a
non-CONFIG_MODVERSIONS module won't be accidentally inserted into a
CONFIG_MODVERSIONS kernel.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28a4acb4

include/linux/vermagic.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,11 @@ 
#else

#else

#define MODULE_VERMAGIC_MODULE_UNLOAD ""

#define MODULE_VERMAGIC_MODULE_UNLOAD ""

#endif

#endif

#ifdef CONFIG_MODVERSIONS

#define MODULE_VERMAGIC_MODVERSIONS "modversions "

#else

#define MODULE_VERMAGIC_MODVERSIONS ""

#endif

#ifndef MODULE_ARCH_VERMAGIC

#ifndef MODULE_ARCH_VERMAGIC

#define MODULE_ARCH_VERMAGIC ""

#define MODULE_ARCH_VERMAGIC ""

#endif

#endif
@@ -24,5 +29,6 @@ 
#define VERMAGIC_STRING 						\

#define VERMAGIC_STRING 						\

	UTS_RELEASE " "							\

	UTS_RELEASE " "							\

	MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT 			\

	MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT 			\

	MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC

	MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS	\

	MODULE_ARCH_VERMAGIC