| 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
| ||
|
Message-ID: <20220326011925.GD2602091@embeddedor>
Date: Fri, 25 Mar 2022 20:19:25 -0500
From: "Gustavo A. R. Silva" <gustavoars@...nel.org>
To: Hannes Reinecke <hare@...e.de>,
"James E.J. Bottomley" <jejb@...ux.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Robert Love <robert.w.love@...el.com>,
James Bottomley <James.Bottomley@...senPartnership.com>
Cc: linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-hardening@...r.kernel.org, Kees Cook <keescook@...omium.org>
Subject: Re: [PATCH][next] scsi: fcoe: Fix Wstringop-overflow warnings in
fcoe_wwn_from_mac()
Hi all,
Friendly ping: who can take this, please?
... I can take this in my -next tree, in the meantime.
Thanks
--
Gustavo
On Thu, Mar 03, 2022 at 05:55:21PM -0600, Gustavo A. R. Silva wrote:
> Fix the following Wstringop-overflow warnings when building with GCC-11:
>
> drivers/scsi/fcoe/fcoe.c: In function ‘fcoe_netdev_config’:
> drivers/scsi/fcoe/fcoe.c:744:32: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 744 | wwnn = fcoe_wwn_from_mac(ctlr->ctl_src_addr, 1, 0);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/scsi/fcoe/fcoe.c:744:32: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/fcoe/fcoe.c:36:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
> drivers/scsi/fcoe/fcoe.c:747:32: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 747 | wwpn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 748 | 2, 0);
> | ~~~~~
> drivers/scsi/fcoe/fcoe.c:747:32: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/fcoe/fcoe.c:36:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
> CC drivers/scsi/bnx2fc/bnx2fc_io.o
> In function ‘bnx2fc_net_config’,
> inlined from ‘bnx2fc_if_create’ at drivers/scsi/bnx2fc/bnx2fc_fcoe.c:1543:7:
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c:833:32: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 833 | wwnn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 834 | 1, 0);
> | ~~~~~
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c: In function ‘bnx2fc_if_create’:
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c:833:32: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/bnx2fc/bnx2fc.h:53,
> from drivers/scsi/bnx2fc/bnx2fc_fcoe.c:17:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
> In function ‘bnx2fc_net_config’,
> inlined from ‘bnx2fc_if_create’ at drivers/scsi/bnx2fc/bnx2fc_fcoe.c:1543:7:
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c:839:32: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 839 | wwpn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 840 | 2, 0);
> | ~~~~~
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c: In function ‘bnx2fc_if_create’:
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c:839:32: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/bnx2fc/bnx2fc.h:53,
> from drivers/scsi/bnx2fc/bnx2fc_fcoe.c:17:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
> drivers/scsi/qedf/qedf_main.c: In function ‘__qedf_probe’:
> drivers/scsi/qedf/qedf_main.c:3520:30: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 3520 | qedf->wwnn = fcoe_wwn_from_mac(qedf->mac, 1, 0);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/scsi/qedf/qedf_main.c:3520:30: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/qedf/qedf.h:9,
> from drivers/scsi/qedf/qedf_main.c:23:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
> drivers/scsi/qedf/qedf_main.c:3521:30: warning: ‘fcoe_wwn_from_mac’ accessing 32 bytes in a region of size 6 [-Wstringop-overflow=]
> 3521 | qedf->wwpn = fcoe_wwn_from_mac(qedf->mac, 2, 0);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/scsi/qedf/qedf_main.c:3521:30: note: referencing argument 1 of type ‘unsigned char *’
> In file included from drivers/scsi/qedf/qedf.h:9,
> from drivers/scsi/qedf/qedf_main.c:23:
> ./include/scsi/libfcoe.h:252:5: note: in a call to function ‘fcoe_wwn_from_mac’
> 252 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> | ^~~~~~~~~~~~~~~~~
>
> by changing the array size to the correct value of ETH_ALEN in the
> argument declaration.
>
> Also, fix a couple of checkpatch warnings:
> WARNING: function definition argument 'unsigned int' should also have an identifier name
>
> This helps with the ongoing efforts to globally enable
> -Wstringop-overflow.
>
> Link: https://github.com/KSPP/linux/issues/181
> Fixes: 85b4aa4926a5 ("[SCSI] fcoe: Fibre Channel over Ethernet")
> Signed-off-by: Gustavo A. R. Silva <gustavoars@...nel.org>
> ---
> drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
> include/scsi/libfcoe.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
> index 1756a0ac6f08..558f3f4e1859 100644
> --- a/drivers/scsi/fcoe/fcoe_ctlr.c
> +++ b/drivers/scsi/fcoe/fcoe_ctlr.c
> @@ -1969,7 +1969,7 @@ EXPORT_SYMBOL(fcoe_ctlr_recv_flogi);
> *
> * Returns: u64 fc world wide name
> */
> -u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
> +u64 fcoe_wwn_from_mac(unsigned char mac[ETH_ALEN],
> unsigned int scheme, unsigned int port)
> {
> u64 wwn;
> diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
> index fac8e89aed81..310e0dbffda9 100644
> --- a/include/scsi/libfcoe.h
> +++ b/include/scsi/libfcoe.h
> @@ -249,7 +249,8 @@ int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
> struct fc_frame *);
>
> /* libfcoe funcs */
> -u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
> +u64 fcoe_wwn_from_mac(unsigned char mac[ETH_ALEN], unsigned int scheme,
> + unsigned int port);
> int fcoe_libfc_config(struct fc_lport *, struct fcoe_ctlr *,
> const struct libfc_function_template *, int init_fcp);
> u32 fcoe_fc_crc(struct fc_frame *fp);
> --
> 2.27.0
>
Powered by blists - more mailing lists