Commit ebab8e09 authored by Kees Cook's avatar Kees Cook Committed by Martin K. Petersen
Browse files

scsi: fcoe: Statically initialize flogi_maddr 

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: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1b67f3d7

drivers/scsi/fcoe/fcoe.c

+2 −4
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 
	struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);

	struct netdev_hw_addr *ha;

	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;



	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

	 * for multiple unicast MACs.

	 */

	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);

	dev_uc_add(netdev, flogi_maddr);

	if (fip->spma)

		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 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;



	/*
@@ -458,7 +457,6 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe) 
	synchronize_net();



	/* Delete secondary MAC addresses */

	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);

	dev_uc_del(netdev, flogi_maddr);

	if (fip->spma)

		dev_uc_del(netdev, fip->ctl_src_addr);