iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: fcoe: Statically initialize flogi_maddr

Browse Source 
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy() avoid using an inline const buffer
argument and instead just statically initialize the destination array
directly.

Link: https://lore.kernel.org/r/20210602180000.3326448-1-keescook@chromium.org
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kees Cook 2021-06-02 11:00:00 -07:00 committed by Martin K. Petersen
parent 1b67f3d74e
commit ebab8e09a0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/fcoe/fcoe.c
View File

@ -293,7 +293,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe); struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
struct net_device *real_dev; struct net_device *real_dev;
u8 flogi_maddr[ETH_ALEN]; static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
const struct net_device_ops *ops; const struct net_device_ops *ops;
fcoe->netdev = netdev; fcoe->netdev = netdev;
@ -336,7 +336,6 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
* or enter promiscuous mode if not capable of listening * or enter promiscuous mode if not capable of listening
* for multiple unicast MACs. * for multiple unicast MACs.
*/ */
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
dev_uc_add(netdev, flogi_maddr); dev_uc_add(netdev, flogi_maddr);
if (fip->spma) if (fip->spma)
dev_uc_add(netdev, fip->ctl_src_addr); dev_uc_add(netdev, fip->ctl_src_addr);
@ -442,7 +441,7 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
{ {
struct net_device *netdev = fcoe->netdev; struct net_device *netdev = fcoe->netdev;
struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe); struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
u8 flogi_maddr[ETH_ALEN]; static const u8 flogi_maddr[ETH_ALEN] = FC_FCOE_FLOGI_MAC;
const struct net_device_ops *ops; const struct net_device_ops *ops;
/* /*
@ -458,7 +457,6 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
synchronize_net(); synchronize_net();
/* Delete secondary MAC addresses */ /* Delete secondary MAC addresses */
memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
dev_uc_del(netdev, flogi_maddr); dev_uc_del(netdev, flogi_maddr);
if (fip->spma) if (fip->spma)
dev_uc_del(netdev, fip->ctl_src_addr); dev_uc_del(netdev, fip->ctl_src_addr);