Commit db586cad authored by Kees Cook's avatar Kees Cook Committed by Paolo Abeni
Browse files

net/ncsi: Use struct sockaddr_storage for pending_mac 



To avoid future casting with coming API type changes, switch struct
ncsi_dev_priv::pending_mac to a full struct sockaddr_storage.

Acked-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarKees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20250521204619.2301870-3-kees@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 16197265

net/ncsi/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ struct ncsi_dev_priv { 
#define NCSI_DEV_RESHUFFLE	4

#define NCSI_DEV_RESET		8            /* Reset state of NC          */

	unsigned int        gma_flag;        /* OEM GMA flag               */

	struct sockaddr     pending_mac;     /* MAC address received from GMA */

	struct sockaddr_storage pending_mac; /* MAC address received from GMA */

	spinlock_t          lock;            /* Protect the NCSI device    */

	unsigned int        package_probe_id;/* Current ID during probe    */

	unsigned int        package_num;     /* Number of packages         */

net/ncsi/ncsi-manage.c

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) 
		break;

	case ncsi_dev_state_config_apply_mac:

		rtnl_lock();

		ret = dev_set_mac_address(dev, &ndp->pending_mac, NULL);

		ret = dev_set_mac_address(dev, (struct sockaddr *)&ndp->pending_mac, NULL);

		rtnl_unlock();

		if (ret < 0)

			netdev_warn(dev, "NCSI: 'Writing MAC address to device failed\n");

net/ncsi/ncsi-rsp.c

+9 −9
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static int ncsi_rsp_handler_snfc(struct ncsi_request *nr) 
static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id)

{

	struct ncsi_dev_priv *ndp = nr->ndp;

	struct sockaddr *saddr = &ndp->pending_mac;

	struct sockaddr_storage *saddr = &ndp->pending_mac;

	struct net_device *ndev = ndp->ndev.dev;

	struct ncsi_rsp_oem_pkt *rsp;

	u32 mac_addr_off = 0;
@@ -644,11 +644,11 @@ static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id) 
	else if (mfr_id == NCSI_OEM_MFR_INTEL_ID)

		mac_addr_off = INTEL_MAC_ADDR_OFFSET;



	saddr->sa_family = ndev->type;

	memcpy(saddr->sa_data, &rsp->data[mac_addr_off], ETH_ALEN);

	saddr->ss_family = ndev->type;

	memcpy(saddr->__data, &rsp->data[mac_addr_off], ETH_ALEN);

	if (mfr_id == NCSI_OEM_MFR_BCM_ID || mfr_id == NCSI_OEM_MFR_INTEL_ID)

		eth_addr_inc((u8 *)saddr->sa_data);

	if (!is_valid_ether_addr((const u8 *)saddr->sa_data))

		eth_addr_inc(saddr->__data);

	if (!is_valid_ether_addr(saddr->__data))

		return -ENXIO;



	/* Set the flag for GMA command which should only be called once */
@@ -1088,7 +1088,7 @@ static int ncsi_rsp_handler_netlink(struct ncsi_request *nr) 
static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr)

{

	struct ncsi_dev_priv *ndp = nr->ndp;

	struct sockaddr *saddr = &ndp->pending_mac;

	struct sockaddr_storage *saddr = &ndp->pending_mac;

	struct net_device *ndev = ndp->ndev.dev;

	struct ncsi_rsp_gmcma_pkt *rsp;

	int i;
@@ -1105,15 +1105,15 @@ static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr) 
			    rsp->addresses[i][4], rsp->addresses[i][5]);

	}



	saddr->sa_family = ndev->type;

	saddr->ss_family = ndev->type;

	for (i = 0; i < rsp->address_count; i++) {

		if (!is_valid_ether_addr(rsp->addresses[i])) {

			netdev_warn(ndev, "NCSI: Unable to assign %pM to device\n",

				    rsp->addresses[i]);

			continue;

		}

		memcpy(saddr->sa_data, rsp->addresses[i], ETH_ALEN);

		netdev_warn(ndev, "NCSI: Will set MAC address to %pM\n", saddr->sa_data);

		memcpy(saddr->__data, rsp->addresses[i], ETH_ALEN);

		netdev_warn(ndev, "NCSI: Will set MAC address to %pM\n", saddr->__data);

		break;

	}