Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-11-30 23:16:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

net, treewide: define and use MAC_ADDR_STR_LEN

Browse Source 
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: Uday Shankar <ushankar@purestorage.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@verge.net.au>
Link: https://patch.msgid.link/20250312-netconsole-v6-1-3437933e79b8@purestorage.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Uday Shankar
2025-03-12 13:51:46 -06:00
committed by Paolo Abeni
parent 34e5ededf4
commit 6d6c1ba782
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/netconsole.c
View File

@@ -739,7 +739,7 @@ static ssize_t remote_mac_store(struct config_item *item, const char *buf,
if (!mac_pton(buf, remote_mac)) if (!mac_pton(buf, remote_mac))
goto out_unlock; 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; goto out_unlock;
memcpy(nt->np.remote_mac, remote_mac, ETH_ALEN); memcpy(nt->np.remote_mac, remote_mac, ETH_ALEN);

2
drivers/nvmem/brcm_nvram.c
View File

@@ -100,7 +100,7 @@ static int brcm_nvram_read_post_process_macaddr(void *context, const char *id, i
{ {
u8 mac[ETH_ALEN]; u8 mac[ETH_ALEN];
if (bytes != 3 * ETH_ALEN - 1) if (bytes != MAC_ADDR_STR_LEN)
return -EINVAL; return -EINVAL;
if (!mac_pton(buf, mac)) if (!mac_pton(buf, mac))

2
drivers/nvmem/layouts/u-boot-env.c
View File

@@ -37,7 +37,7 @@ static int u_boot_env_read_post_process_ethaddr(void *context, const char *id, i
{ {
u8 mac[ETH_ALEN]; u8 mac[ETH_ALEN];
if (bytes != 3 * ETH_ALEN - 1) if (bytes != MAC_ADDR_STR_LEN)
return -EINVAL; return -EINVAL;
if (!mac_pton(buf, mac)) if (!mac_pton(buf, mac))

3
include/linux/if_ether.h
View File

@@ -19,6 +19,9 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <uapi/linux/if_ether.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) static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
{ {
return (struct ethhdr *)skb_mac_header(skb); return (struct ethhdr *)skb_mac_header(skb);

4
lib/net_utils.c
View File

@@ -7,11 +7,9 @@
bool mac_pton(const char *s, u8 *mac) bool mac_pton(const char *s, u8 *mac)
{ {
size_t maxlen = 3 * ETH_ALEN - 1;
int i; int i;
/* XX:XX:XX:XX:XX:XX */ if (strnlen(s, MAC_ADDR_STR_LEN) < MAC_ADDR_STR_LEN)
if (strnlen(s, maxlen) < maxlen)
return false; return false;
/* Don't dirty result unless string is valid MAC. */ /* Don't dirty result unless string is valid MAC. */

7
net/mac80211/debugfs_sta.c
View File

@@ -457,11 +457,12 @@ static ssize_t link_sta_addr_read(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct link_sta_info *link_sta = file->private_data; struct link_sta_info *link_sta = file->private_data;
u8 mac[3 * ETH_ALEN + 1]; u8 mac[MAC_ADDR_STR_LEN + 2];
snprintf(mac, sizeof(mac), "%pM\n", link_sta->pub->addr); snprintf(mac, sizeof(mac), "%pM\n", link_sta->pub->addr);
return simple_read_from_buffer(userbuf, count, ppos, mac, 3 * ETH_ALEN); return simple_read_from_buffer(userbuf, count, ppos, mac,
MAC_ADDR_STR_LEN + 1);
} }
LINK_STA_OPS(addr); LINK_STA_OPS(addr);
@@ -1240,7 +1241,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
struct ieee80211_local *local = sta->local; struct ieee80211_local *local = sta->local;
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
struct dentry *stations_dir = sta->sdata->debugfs.subdir_stations; struct dentry *stations_dir = sta->sdata->debugfs.subdir_stations;
u8 mac[3*ETH_ALEN]; u8 mac[MAC_ADDR_STR_LEN + 1];
if (!stations_dir) if (!stations_dir)
return; return;