Skip to content

Commit 51161bf

Browse files
Leon Romanovskydavem330
authored andcommitted
kernel/module: Hide vermagic header file from general use
VERMAGIC* definitions are not supposed to be used by the drivers, see this [1] bug report, so introduce special define to guard inclusion of this header file and define it in kernel/modules.h and in internal script that generates *.mod.c files. In-tree module build: ➜ kernel git:(vermagic) ✗ make clean ➜ kernel git:(vermagic) ✗ make M=drivers/infiniband/hw/mlx5 ➜ kernel git:(vermagic) ✗ modinfo drivers/infiniband/hw/mlx5/mlx5_ib.ko filename: /images/leonro/src/kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko <...> vermagic: 5.6.0+ SMP mod_unload modversions Out-of-tree module build: ➜ mlx5 make -C /images/leonro/src/kernel clean M=/tmp/mlx5 ➜ mlx5 make -C /images/leonro/src/kernel M=/tmp/mlx5 ➜ mlx5 modinfo /tmp/mlx5/mlx5_ib.ko filename: /tmp/mlx5/mlx5_ib.ko <...> vermagic: 5.6.0+ SMP mod_unload modversions [1] https://lore.kernel.org/lkml/[email protected] Reported-by: Borislav Petkov <[email protected]> Acked-by: Borislav Petkov <[email protected]> Acked-by: Jessica Yu <[email protected]> Co-developed-by: Masahiro Yamada <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b4f3721 commit 51161bf

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

include/linux/vermagic.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2+
3+
#ifndef INCLUDE_VERMAGIC
4+
#error "This header can be included from kernel/module.c or *.mod.c only"
5+
#endif
6+
27
#include <generated/utsrelease.h>
38

49
/* Simply sanity version stamp for modules. */

kernel/module.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
Copyright (C) 2001 Rusty Russell, 2002, 2010 Rusty Russell IBM.
55
66
*/
7+
8+
#define INCLUDE_VERMAGIC
9+
710
#include <linux/export.h>
811
#include <linux/extable.h>
912
#include <linux/moduleloader.h>

scripts/mod/modpost.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,7 @@ static void add_header(struct buffer *b, struct module *mod)
22512251
* Include build-salt.h after module.h in order to
22522252
* inherit the definitions.
22532253
*/
2254+
buf_printf(b, "#define INCLUDE_VERMAGIC\n");
22542255
buf_printf(b, "#include <linux/build-salt.h>\n");
22552256
buf_printf(b, "#include <linux/vermagic.h>\n");
22562257
buf_printf(b, "#include <linux/compiler.h>\n");

0 commit comments

Comments
 (0)