From: Leon Romanovsky <leon@kernel.org>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Leon Romanovsky <leonro@mellanox.com>,
Borislav Petkov <bp@suse.de>, Jessica Yu <jeyu@kernel.org>,
linux-kbuild@vger.kernel.org,
Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
netdev@vger.kernel.org
Subject: [PATCH net-next v1 4/4] kernel/module: Hide vermagic header file from general use
Date: Wed, 15 Apr 2020 16:36:48 +0300 [thread overview]
Message-ID: <20200415133648.1306956-5-leon@kernel.org> (raw)
In-Reply-To: <20200415133648.1306956-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
VERMAGIC* definitions are not supposed to be used by the drivers,
see this [1] bug report, so simply move this header file to be visible
to kernel/* and scripts files only.
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/20200411155623.GA22175@zn.tnic
Reported-by: Borislav Petkov <bp@suse.de>
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
kernel/module.c | 2 +-
{include/linux => kernel}/vermagic.h | 0
scripts/mod/modpost.c | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename {include/linux => kernel}/vermagic.h (100%)
diff --git a/kernel/module.c b/kernel/module.c
index 3447f3b74870..fce06095d341 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -29,7 +29,6 @@
#include <linux/moduleparam.h>
#include <linux/errno.h>
#include <linux/err.h>
-#include <linux/vermagic.h>
#include <linux/notifier.h>
#include <linux/sched.h>
#include <linux/device.h>
@@ -55,6 +54,7 @@
#include <linux/audit.h>
#include <uapi/linux/module.h>
#include "module-internal.h"
+#include "vermagic.h"
#define CREATE_TRACE_POINTS
#include <trace/events/module.h>
diff --git a/include/linux/vermagic.h b/kernel/vermagic.h
similarity index 100%
rename from include/linux/vermagic.h
rename to kernel/vermagic.h
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 5c3c50c5ec52..91f86261bcfe 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2252,7 +2252,7 @@ static void add_header(struct buffer *b, struct module *mod)
* inherit the definitions.
*/
buf_printf(b, "#include <linux/build-salt.h>\n");
- buf_printf(b, "#include <linux/vermagic.h>\n");
+ buf_printf(b, "#include <../kernel/vermagic.h>\n");
buf_printf(b, "#include <linux/compiler.h>\n");
buf_printf(b, "\n");
buf_printf(b, "BUILD_SALT;\n");
--
2.25.2
next prev parent reply other threads:[~2020-04-15 13:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 13:36 [PATCH net-next v1 0/4] Remove vermagic header from global include folder Leon Romanovsky
2020-04-15 13:36 ` [PATCH net-next v1 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
2020-04-15 13:36 ` [PATCH net-next v1 2/4] net/hns: Remove custom driver version in favour of global one Leon Romanovsky
2020-04-15 13:36 ` [PATCH net-next v1 3/4] net/nfp: Update driver to use global kernel version Leon Romanovsky
2020-04-15 13:36 ` Leon Romanovsky [this message]
2020-04-17 11:12 ` [PATCH net-next v1 4/4] kernel/module: Hide vermagic header file from general use Jessica Yu
2020-04-17 12:07 ` Masahiro Yamada
2020-04-17 14:37 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415133648.1306956-5-leon@kernel.org \
--to=leon@kernel.org \
--cc=bp@suse.de \
--cc=davem@davemloft.net \
--cc=jeyu@kernel.org \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.