From patchwork Mon Feb 17 07:18:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uday Shankar X-Patchwork-Id: 13977194 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from mail-io1-f99.google.com (mail-io1-f99.google.com [209.85.166.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25F04195F0D for ; Mon, 17 Feb 2025 07:18:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739776740; cv=none; b=f+7gGWb7PrvLYdvNG7roe7xGpSiox04fR4ZysrZ2QEkSaS31ronGk/5PvEmlLoXGBJQ7n5T6hGR7JPXlYqHC8yPybQaLwsuyWKKLZfz/F1NiDE7XCDmtxpQ2YSSj/KbSIfMXJDT617GdEyueIFSJ8Mnuz4NTdb51r6uxkRgh+Gg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739776740; c=relaxed/simple; bh=9SP3e+84PPazYbiy6XBKwEpLpUqLgr7OPIfv2oglgb8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F5qDolWBMXn+wvThD33aA3VOtPe2U9jtcFTav6GoWRryzpinjzFLhI7FXvKCqzcF1DKGb4+ECLNqCg5XhsdSEgQd2nVriF7YBRe9wIM+5P1lDsJ1LKJNcWe62OicZ0Kzkljn7Xx+GGnPxHcvtag1+xJGz0GnLnXAxCENTrDget4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=aTHjcRJu; arc=none smtp.client-ip=209.85.166.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="aTHjcRJu" Received: by mail-io1-f99.google.com with SMTP id ca18e2360f4ac-85571df0265so215223139f.2 for ; Sun, 16 Feb 2025 23:18:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1739776737; x=1740381537; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A/lIZdaULwllL9eB2jMZEZDqOXSYIw/jFwTSaiFKlq0=; b=aTHjcRJuLuyLq+pF401Nn8NQtqH2NR4tzDOpmXVkgeduIxUKFJTGfpNk3n3N9Gl8uN CRXQ//nmKFP5oq0ZNyDzw2Cx0K2bSJJU1IGZ+gL1rrMlTnIWfT4xQzLSYIglrbt+CtVx q2HPOOfqjXrvLlQbcrrd9q4IplaifycFQFj6A8oDhpE1jwinyAUEWZc+f+WnQX32be7l 0l99xGuPK3P0Vjnl9V9unaVwcxC2JgC4nsLV+Qu/WEdwHbRDzVvSNzySRIX62X2nv2I6 AUedkrMy2Kx/HAV3JmCuvKfv9A43XH9Emah7ekCQc527Z4RWOJAU+vXwHGCN5eOYSIaV rVRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739776737; x=1740381537; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A/lIZdaULwllL9eB2jMZEZDqOXSYIw/jFwTSaiFKlq0=; b=hmyc3iXH1mOEZ+uwjl/L+8pGHY8B5nHIYE+mZKsu+1u9pIwvK4IOuSFpp5Q8+UKAR8 bB7bsK10Ao8nuWSmnFLVbm+uMPjuQPm8ich/mdsAml+m2Nd264KKM+lPdDmrbTd2VIlr zoTgMZpRWomzVBt1j7TORHwQlmc9rNEeC32kpjclB4LoeI22gozOqpLYGwlHdD9f2oTZ GShSW4RPZRN2FLaA1FmzoVvlGlGJgOOgLqRfIe0OWuVNQyRJme5tZJWWn5xArLSz6B1C ql0C6ZS7QobyMkYHe1Qtzn+drLksmJLQO52lZLrQiT7j5zSLEHQrxU08y1WoXY00G3/H jR3g== X-Forwarded-Encrypted: i=1; AJvYcCXss+L/24Oge3zeG3jgq19Nj9WpMozx+9ChLoFuIOLWkvSdFqUOey0EmrG4fgWswy000/qqKCxJm3R+2gLEzA==@vger.kernel.org X-Gm-Message-State: AOJu0YyONH158Xp8iV7/784EyLoeazvobbg5ZqDDT6qutnSHT8U6TvXj kwEHA+eQYrUntvSFiNkGS1pvDFV08vo/61W7uzf6jIhuQlEC3CUOHBC1/jG4g0kjKMNgvcxMRIz uyLPVW6/g10VsW4h+7Z1mAmgv9mcDDnkPMuRApB5tvNhf4t5D X-Gm-Gg: ASbGncu1eqUOy/JbyH89K57T6CA2ruID9vH9IYBK4pYjSHmMYa35w1tw6pNh0aNf5N0 uYob1enckdM8huHZ44wZG7A0D+EEaf6jOLzkJ78+HsJvDXhDUxiUBXqEXMpRfPqL7yVsqcyZOc6 IILa6g9Pkv+Vv+mlM7wdfYkdQuIc0DUmTMM/OdeJmgao2OMLCaG1KZI+AXPjeapBNe7Vu/4nqht tA/wipEohK4jEqtujxGAO+o28ITFGdcwA/rvw7e9UlP4TmVOl+ZoVKjGFwWxfAYZowDDmnFP86R 0VSHdzp9ca0RXYzFsjEW12BA X-Google-Smtp-Source: AGHT+IFmspdvwMqwmo9Ic5vcbstKN1DL+FAbVNevL9CSgdJK6lu5bk2Az58mcvHOy5eaTMPPofayKyIj+Bmv X-Received: by 2002:a05:6602:6408:b0:855:6fa2:c324 with SMTP id ca18e2360f4ac-8557a0ce310mr872509839f.4.1739776737129; Sun, 16 Feb 2025 23:18:57 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4ed282a0d77sm547484173.54.2025.02.16.23.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 23:18:57 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-ushankar.dev.purestorage.com (dev-ushankar.dev.purestorage.com [10.7.70.36]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 8E1E334035D; Mon, 17 Feb 2025 00:18:55 -0700 (MST) Received: by dev-ushankar.dev.purestorage.com (Postfix, from userid 1557716368) id 84744E56BB7; Mon, 17 Feb 2025 00:18:55 -0700 (MST) From: Uday Shankar Date: Mon, 17 Feb 2025 00:18:45 -0700 Subject: [PATCH net-next v4 2/3] net, treewide: define and use MAC_ADDR_STR_LEN Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250217-netconsole-v4-2-0c681cef71f1@purestorage.com> References: <20250217-netconsole-v4-0-0c681cef71f1@purestorage.com> In-Reply-To: <20250217-netconsole-v4-0-0c681cef71f1@purestorage.com> To: Breno Leitao , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Srinivas Kandagatla , =?utf-8?b?UmFmYcWC?= =?utf-8?b?IE1pxYJlY2tp?= , Simon Horman , Andrew Morton , Johannes Berg , Jonathan Corbet Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, linux-doc@vger.kernel.org, Uday Shankar , Michal Swiatkowski X-Mailer: b4 0.14.2 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 Reviewed-by: Michal Swiatkowski Acked-by: Johannes Berg --- drivers/net/netconsole.c | 2 +- drivers/nvmem/brcm_nvram.c | 2 +- drivers/nvmem/layouts/u-boot-env.c | 2 +- include/linux/if_ether.h | 3 +++ lib/net_utils.c | 4 +--- net/mac80211/debugfs_sta.c | 7 ++++--- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index f77eddf221850fe2778cd479e49c91ad695aba3c..12699831e3c9fdbafd4862a339aea4ef04cf522b 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -721,7 +721,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); diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c index b810df727b446b1762a1851750f743e0de6e8788..b4cf245fb2467d281111001bb7ed8db5993a09b2 100644 --- a/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c @@ -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)) diff --git a/drivers/nvmem/layouts/u-boot-env.c b/drivers/nvmem/layouts/u-boot-env.c index 731e6f4f12b2bf28e4547d128954a095545ad461..436426d4e8f910b51b92f88acddfbb40d374587a 100644 --- a/drivers/nvmem/layouts/u-boot-env.c +++ b/drivers/nvmem/layouts/u-boot-env.c @@ -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)) diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 8a9792a6427ad9cf58b50c79cbfe185615800dcb..61b7335aa037c7232a0caa45572043057c02dde3 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -19,6 +19,9 @@ #include #include +/* 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); diff --git a/lib/net_utils.c b/lib/net_utils.c index 42bb0473fb22f977409f7a6792bb1340f4e911c3..215cda672fee1b5a029c2b61529c6813c0edab11 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c @@ -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. */ diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index a67a9d3160086ac492d77092a0c8a74d2384b28c..a8948f4d983e5edee45d90ad267582657ed38e38 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -457,11 +457,12 @@ static ssize_t link_sta_addr_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) { 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); - 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); @@ -1240,7 +1241,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) struct ieee80211_local *local = sta->local; struct ieee80211_sub_if_data *sdata = sta->sdata; struct dentry *stations_dir = sta->sdata->debugfs.subdir_stations; - u8 mac[3*ETH_ALEN]; + u8 mac[MAC_ADDR_STR_LEN + 1]; if (!stations_dir) return;