diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-05-09 02:23:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 10:45:18 -0400 |
| commit | 6c2545eefffc452e52302c96c955d9aa26353aa9 (patch) | |
| tree | e182a3b98b0d659787780b1c6ae7a22d264b5c5e /include/linux | |
| parent | 28a4acb48586dc21d2d14a75a7aab7be78b7c83b (diff) | |
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: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/vermagic.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index 4d0909e53595..79b9837d9ca0 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h | |||
| @@ -17,6 +17,11 @@ | |||
| 17 | #else | 17 | #else |
| 18 | #define MODULE_VERMAGIC_MODULE_UNLOAD "" | 18 | #define MODULE_VERMAGIC_MODULE_UNLOAD "" |
| 19 | #endif | 19 | #endif |
| 20 | #ifdef CONFIG_MODVERSIONS | ||
| 21 | #define MODULE_VERMAGIC_MODVERSIONS "modversions " | ||
| 22 | #else | ||
| 23 | #define MODULE_VERMAGIC_MODVERSIONS "" | ||
| 24 | #endif | ||
| 20 | #ifndef MODULE_ARCH_VERMAGIC | 25 | #ifndef MODULE_ARCH_VERMAGIC |
| 21 | #define MODULE_ARCH_VERMAGIC "" | 26 | #define MODULE_ARCH_VERMAGIC "" |
| 22 | #endif | 27 | #endif |
| @@ -24,5 +29,6 @@ | |||
| 24 | #define VERMAGIC_STRING \ | 29 | #define VERMAGIC_STRING \ |
| 25 | UTS_RELEASE " " \ | 30 | UTS_RELEASE " " \ |
| 26 | MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ | 31 | MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ |
| 27 | MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC | 32 | MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ |
| 33 | MODULE_ARCH_VERMAGIC | ||
| 28 | 34 | ||
