Commit 6d6c1ba7 authored by Uday Shankar's avatar Uday Shankar Committed by Paolo Abeni
Browse files

net, treewide: define and use MAC_ADDR_STR_LEN 



There are a few places in the tree which compute the length of the
string representation of a MAC address as 3 * ETH_ALEN - 1. Define a
constant for this and use it where relevant. No functionality changes
are expected.

Signed-off-by: default avatarUday Shankar <ushankar@purestorage.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSimon Horman <horms@verge.net.au>
Link: https://patch.msgid.link/20250312-netconsole-v6-1-3437933e79b8@purestorage.com


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

drivers/net/netconsole.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static ssize_t remote_mac_store(struct config_item *item, const char *buf, 


	if (!mac_pton(buf, remote_mac))

		goto out_unlock;

	if (buf[3 * ETH_ALEN - 1] && buf[3 * ETH_ALEN - 1] != '\n')

	if (buf[MAC_ADDR_STR_LEN] && buf[MAC_ADDR_STR_LEN] != '\n')

		goto out_unlock;

	memcpy(nt->np.remote_mac, remote_mac, ETH_ALEN);

drivers/nvmem/brcm_nvram.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int brcm_nvram_read_post_process_macaddr(void *context, const char *id, i 
{

	u8 mac[ETH_ALEN];



	if (bytes != 3 * ETH_ALEN - 1)

	if (bytes != MAC_ADDR_STR_LEN)

		return -EINVAL;



	if (!mac_pton(buf, mac))

drivers/nvmem/layouts/u-boot-env.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int u_boot_env_read_post_process_ethaddr(void *context, const char *id, i 
{

	u8 mac[ETH_ALEN];



	if (bytes != 3 * ETH_ALEN - 1)

	if (bytes != MAC_ADDR_STR_LEN)

		return -EINVAL;



	if (!mac_pton(buf, mac))

include/linux/if_ether.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#include <linux/skbuff.h>

#include <uapi/linux/if_ether.h>



/* XX:XX:XX:XX:XX:XX */

#define MAC_ADDR_STR_LEN (3 * ETH_ALEN - 1)



static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)

{

	return (struct ethhdr *)skb_mac_header(skb);

lib/net_utils.c

+1 −3
Original line number Diff line number Diff line
@@ -7,11 +7,9 @@ 


bool mac_pton(const char *s, u8 *mac)

{

	size_t maxlen = 3 * ETH_ALEN - 1;

	int i;



	/* XX:XX:XX:XX:XX:XX */

	if (strnlen(s, maxlen) < maxlen)

	if (strnlen(s, MAC_ADDR_STR_LEN) < MAC_ADDR_STR_LEN)

		return false;



	/* Don't dirty result unless string is valid MAC. */