netdev - Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <823d56e6-87c2-35d2-c89e-57185ee45e7b@pensando.io>
Date:   Tue, 14 Apr 2020 10:32:43 -0700
From:   Shannon Nelson <snelson@...sando.io>
To:     Leon Romanovsky <leon@...nel.org>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>
Cc:     Leon Romanovsky <leonro@...lanox.com>,
        Andy Gospodarek <andy@...yhouse.net>,
        Borislav Petkov <bp@...e.de>, Ion Badulescu <ionut@...ula.org>,
        Jay Vosburgh <j.vosburgh@...il.com>, linux-pm@...r.kernel.org,
        netdev@...r.kernel.org, Pensando Drivers <drivers@...sando.io>,
        Sebastian Reichel <sre@...nel.org>,
        Veaceslav Falico <vfalico@...il.com>
Subject: Re: [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header

On 4/14/20 8:57 AM, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@...lanox.com>
>
> Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
> the arch header arch/x86/include/asm/module.h won't be redefined.
>
>    In file included from ./include/linux/module.h:30,
>                     from drivers/net/ethernet/3com/3c515.c:56:
>    ./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC"
> redefined
>       73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
>          |
>    In file included from drivers/net/ethernet/3com/3c515.c:25:
>    ./include/linux/vermagic.h:28: note: this is the location of the
> previous definition
>       28 | #define MODULE_ARCH_VERMAGIC ""
>          |
>
> Fixes: 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers")
> Signed-off-by: Borislav Petkov <bp@...e.de>
> Signed-off-by: Leon Romanovsky <leonro@...lanox.com>

for ionic driver:
Acked-by: Shannon Nelson <snelson@...sando.io>

> ---
>   drivers/net/bonding/bonding_priv.h               | 2 +-
>   drivers/net/ethernet/3com/3c509.c                | 1 -
>   drivers/net/ethernet/3com/3c515.c                | 1 -
>   drivers/net/ethernet/adaptec/starfire.c          | 1 -
>   drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +-
>   drivers/power/supply/test_power.c                | 2 +-
>   net/ethtool/ioctl.c                              | 3 +--
>   7 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
> index 45b77bc8c7b3..48cdf3a49a7d 100644
> --- a/drivers/net/bonding/bonding_priv.h
> +++ b/drivers/net/bonding/bonding_priv.h
> @@ -14,7 +14,7 @@
>   
>   #ifndef _BONDING_PRIV_H
>   #define _BONDING_PRIV_H
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>   
>   #define DRV_NAME	"bonding"
>   #define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"
> diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
> index b762176a1406..139d0120f511 100644
> --- a/drivers/net/ethernet/3com/3c509.c
> +++ b/drivers/net/ethernet/3com/3c509.c
> @@ -85,7 +85,6 @@
>   #include <linux/device.h>
>   #include <linux/eisa.h>
>   #include <linux/bitops.h>
> -#include <linux/vermagic.h>
>   
>   #include <linux/uaccess.h>
>   #include <asm/io.h>
> diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
> index 90312fcd6319..47b4215bb93b 100644
> --- a/drivers/net/ethernet/3com/3c515.c
> +++ b/drivers/net/ethernet/3com/3c515.c
> @@ -22,7 +22,6 @@
>   
>   */
>   
> -#include <linux/vermagic.h>
>   #define DRV_NAME		"3c515"
>   
>   #define CORKSCREW 1
> diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
> index 2db42211329f..a64191fc2af9 100644
> --- a/drivers/net/ethernet/adaptec/starfire.c
> +++ b/drivers/net/ethernet/adaptec/starfire.c
> @@ -45,7 +45,6 @@
>   #include <asm/processor.h>		/* Processor type for cache alignment. */
>   #include <linux/uaccess.h>
>   #include <asm/io.h>
> -#include <linux/vermagic.h>
>   
>   /*
>    * The current frame processor firmware fails to checksum a fragment
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> index 588c62e9add7..3ed150512091 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
> @@ -6,7 +6,7 @@
>   #include <linux/module.h>
>   #include <linux/netdevice.h>
>   #include <linux/utsname.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>   
>   #include "ionic.h"
>   #include "ionic_bus.h"
> diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
> index 65c23ef6408d..b3c05ff05783 100644
> --- a/drivers/power/supply/test_power.c
> +++ b/drivers/power/supply/test_power.c
> @@ -16,7 +16,7 @@
>   #include <linux/power_supply.h>
>   #include <linux/errno.h>
>   #include <linux/delay.h>
> -#include <linux/vermagic.h>
> +#include <generated/utsrelease.h>
>   
>   enum test_power_id {
>   	TEST_AC,
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 89d0b1827aaf..d3cb5a49a0ce 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -17,7 +17,6 @@
>   #include <linux/phy.h>
>   #include <linux/bitops.h>
>   #include <linux/uaccess.h>
> -#include <linux/vermagic.h>
>   #include <linux/vmalloc.h>
>   #include <linux/sfp.h>
>   #include <linux/slab.h>
> @@ -28,7 +27,7 @@
>   #include <net/xdp_sock.h>
>   #include <net/flow_offload.h>
>   #include <linux/ethtool_netlink.h>
> -
> +#include <generated/utsrelease.h>
>   #include "common.h"
>   
>   /*