Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 786f5281 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

ethtool: Null-terminate filename passed to ethtool_ops::flash_device 



The parameters for ETHTOOL_FLASHDEV include a filename, which ought to
be null-terminated.  Currently the only driver that implements
ethtool_ops::flash_device attempts to add a null terminator if
necessary, but does it wrongly.  Do it in the ethtool core instead.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efcdbf24

drivers/net/ethernet/emulex/benet/be_ethtool.c

+1 −5
Original line number Diff line number Diff line
@@ -716,12 +716,8 @@ static int 
be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	char file_name[ETHTOOL_FLASH_MAX_FILENAME];



	file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;

	strcpy(file_name, efl->data);



	return be_load_fw(adapter, file_name);

	return be_load_fw(adapter, efl->data);

}



static int

net/core/ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev, 
	if (!dev->ethtool_ops->flash_device)

		return -EOPNOTSUPP;



	efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;



	return dev->ethtool_ops->flash_device(dev, &efl);

}