From: Liu Chao <liuc63@xiaopeng.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
khtsai@google.com, fangxy@xiaopeng.com,
Randy Dunlap <rdunlap@infradead.org>,
dbrownell@users.sourceforge.net, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v5 2/2] usb: gadget: u_ether: fix out-of-bounds read in get_ether_addr
Date: Tue, 17 Nov 2026 17:00:35 +0800 [thread overview]
Message-ID: <20261117090110.3263592-3-liuc63@xiaopeng.com> (raw)
In-Reply-To: <20261117090110.3263592-1-liuc63@xiaopeng.com>
get_ether_addr() walks the MAC address string with a fixed six iteration
loop, calling hex_to_bin() twice per iteration, and never checks for the
terminating NUL. A short string therefore makes it read past the end of
the buffer. The dev_addr and host_addr module parameters of the legacy
gadget drivers are copied into their own kmalloc'ed buffer by
param_set_charp(), so the overrun crosses a slab boundary and KASAN
reports it at insmod time:
# insmod g_ether.ko dev_addr=ab
BUG: KASAN: slab-out-of-bounds in get_ether_addr+0x1ec/0x230
Read of size 1 at addr ffff888009f91f53 by task insmod/70
...
get_ether_addr+0x1ec/0x230
gether_set_dev_addr+0x6b/0x180
eth_bind+0xfd/0x3b0 [g_ether]
composite_bind+0x1bb/0x7b0
gadget_bind_driver+0x229/0xb00
...
Allocated by task 70:
__kmalloc_noprof+0x1d1/0x4a0
param_set_charp+0x4a/0x220
parse_args+0x267/0x5c0
load_module+0x4f6a/0x6600
...
The buggy address is located 0 bytes to the right of
allocated 19-byte region [ffff888009f91f40, ffff888009f91f53)
Besides reading past the end of the string, the loop ignores what
hex_to_bin() returns: it yields -1 for a character that is not a hex
digit, and that value is shifted and OR'ed into dev_addr unchecked, so a
malformed address can be accepted as a valid one and the interface comes
up with an address that nobody asked for:
# insmod g_ether.ko dev_addr=aazz:cc:dd:ee:ff
# cat /sys/class/net/usb0/address
aa:ff:cc:dd:ee:ff
The configfs dev_addr and host_addr attributes of the ECM, EEM, NCM,
RNDIS and subset functions reach the same parser through
gether_set_dev_addr() and gether_set_host_addr(). Their store handler
passes the whole configfs buffer on, so an overrun there stays inside the
same object and is never reported, but a malformed address is silently
accepted all the same.
Replace the open coded loop with parse_mac_pton() for the delimited
notations and hex2bin() for the raw one, and keep the existing
eth_random_addr() fallback for everything both of them reject.
parse_mac_pton() checks the minimum length and every digit before writing
anything to dev_addr, and hex2bin() stops at the first character that is
not a hex digit, which the NUL terminator is, so neither reads past the
end of the string.
The notations that keep working are the byte pair ones, ':' and '.', in
any mixture, and the separator-less "aabbccddeeff". What stops working
is the Cisco notation "aabb.ccdd.eeff" and irregular groupings such as
"123456:789abc", which the old loop only accepted because it skipped a
delimiter wherever it happened to find one. Supporting them would need
a parser per grouping, so such input is now rejected.
Neither of the two should be missed: they are historical notations that
are rarely met these days, and the commit that introduced the loop never
said that it accepted them. That commit only explains that it resolves
a FIXME by adding module parameters for stable addresses, so skipping a
delimiter wherever one happens to turn up reads as a simplification of
the parser rather than as support for non-standard formats.
How a rejected address is reported depends on the caller. The legacy
module parameters go through gether_setup_name(), which keeps the random
address that get_ether_addr() falls back to and only logs a warning. The
configfs attributes go through gether_set_dev_addr() and
gether_set_host_addr(), which return -EINVAL, so the store fails and the
attribute keeps its previous value: writing "aabb.ccdd.eeff" to dev_addr
used to succeed and now fails. This commit documents the accepted
formats in the configfs ABI files of all five functions.
Select GENERIC_NET_UTILS so that parse_mac_pton() is built in.
The loop is older than the git history. It was introduced by
331a2d82bcaf ("[PATCH] USB: ethernet/rndis gadget address params") from
v2.6.7 in drivers/usb/gadget/ether.c, and commit 2b3d942c4878 ("usb
ethernet gadget: split out network core") copied it into u_ether.c.
331a2d82bcaf predates the git conversion and only resolves in the
historic tree history.git, so the Fixes: tag points at the start of the
official git era, commit 1da177e4c3f4 ("Linux-2.6.12-rc2"), and the
commit that actually introduced the loop is named here in prose.
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Liu Chao <liuc63@xiaopeng.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
---
v5: no driver code change. Describe the configfs behaviour accurately
(a rejected address fails the store with -EINVAL and keeps the old
value; only the legacy module parameters fall back to a random
address), name all five functions that use the parser, document the
accepted formats in their configfs ABI files, restore a Fixes: tag
for 1da177e4c3f4 ("Linux-2.6.12-rc2") while keeping the real
introducing commit in prose, and say "minimum length" where v4 said
"length".
v4: pick up Andy's Reviewed-by; name 331a2d82bcaf from v2.6.7 as the
commit that introduced the loop and note that it only resolves in
history.git; record that the notations being dropped are historical
and were never documented as supported. No code change.
v3: fall back to hex2bin() so that the separator-less notation keeps
working, as suggested by Andy; drop the Fixes tag, the loop predates
the git history.
v2: rework on top of parse_mac_pton(), add the KASAN report and the
malformed address example, select GENERIC_NET_UTILS, drop Cc: stable
and the Reviewed-by.
Link: https://lore.kernel.org/all/20261106030605.576584-3-liuc63@xiaopeng.com/
.../ABI/testing/configfs-usb-gadget-ecm | 7 ++++++-
.../ABI/testing/configfs-usb-gadget-eem | 7 +++++++
.../ABI/testing/configfs-usb-gadget-ncm | 6 ++++++
.../ABI/testing/configfs-usb-gadget-rndis | 7 +++++++
.../ABI/testing/configfs-usb-gadget-subset | 7 +++++++
drivers/usb/gadget/Kconfig | 1 +
drivers/usb/gadget/function/u_ether.c | 18 ++++++++----------
7 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-ecm b/Documentation/ABI/testing/configfs-usb-gadget-ecm
index 732101ca9d0b..076567aacf16 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-ecm
+++ b/Documentation/ABI/testing/configfs-usb-gadget-ecm
@@ -17,4 +17,9 @@ Description:
- MAC address of device's end of this
Ethernet over USB link
-
+ host_addr and dev_addr accept a MAC address as six byte
+ pairs separated by ':' or '.', in any mixture
+ (aa:bb:cc:dd:ee:ff, aa.bb.cc.dd.ee.ff), or as twelve
+ hexadecimal digits with no separator (aabbccddeeff). Any
+ other format is rejected: the write fails with EINVAL and
+ the attribute keeps its previous value.
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-eem b/Documentation/ABI/testing/configfs-usb-gadget-eem
index 178c3d5fb647..fb2be6ac0864 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-eem
+++ b/Documentation/ABI/testing/configfs-usb-gadget-eem
@@ -14,3 +14,10 @@ Description:
dev_addr MAC address of device's end of this
Ethernet over USB link
========== =============================================
+
+ host_addr and dev_addr accept a MAC address as six byte
+ pairs separated by ':' or '.', in any mixture
+ (aa:bb:cc:dd:ee:ff, aa.bb.cc.dd.ee.ff), or as twelve
+ hexadecimal digits with no separator (aabbccddeeff). Any
+ other format is rejected: the write fails with EINVAL and
+ the attribute keeps its previous value.
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-ncm b/Documentation/ABI/testing/configfs-usb-gadget-ncm
index 6fe723effc78..a98ba929f2c2 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-ncm
+++ b/Documentation/ABI/testing/configfs-usb-gadget-ncm
@@ -13,3 +13,9 @@ Description:
dev_addr - MAC address of device's end of this
Ethernet over USB link
+ host_addr and dev_addr accept a MAC address as six byte
+ pairs separated by ':' or '.', in any mixture
+ (aa:bb:cc:dd:ee:ff, aa.bb.cc.dd.ee.ff), or as twelve
+ hexadecimal digits with no separator (aabbccddeeff). Any
+ other format is rejected: the write fails with EINVAL and
+ the attribute keeps its previous value.
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-rndis b/Documentation/ABI/testing/configfs-usb-gadget-rndis
index 9416eda7fe93..775b32cae136 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-rndis
+++ b/Documentation/ABI/testing/configfs-usb-gadget-rndis
@@ -17,3 +17,10 @@ Description:
subclass USB interface subclass, default is 06 (hex)
protocol USB interface protocol, default is 00 (hex)
========= =============================================
+
+ host_addr and dev_addr accept a MAC address as six byte
+ pairs separated by ':' or '.', in any mixture
+ (aa:bb:cc:dd:ee:ff, aa.bb.cc.dd.ee.ff), or as twelve
+ hexadecimal digits with no separator (aabbccddeeff). Any
+ other format is rejected: the write fails with EINVAL and
+ the attribute keeps its previous value.
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-subset b/Documentation/ABI/testing/configfs-usb-gadget-subset
index 0061b864351f..f67537fe53a0 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-subset
+++ b/Documentation/ABI/testing/configfs-usb-gadget-subset
@@ -14,3 +14,10 @@ Description:
dev_addr MAC address of device's end of this
Ethernet over USB link
========== =============================================
+
+ host_addr and dev_addr accept a MAC address as six byte
+ pairs separated by ':' or '.', in any mixture
+ (aa:bb:cc:dd:ee:ff, aa.bb.cc.dd.ee.ff), or as twelve
+ hexadecimal digits with no separator (aabbccddeeff). Any
+ other format is rejected: the write fails with EINVAL and
+ the attribute keeps its previous value.
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 76521555e3c1..b83c42be686b 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -158,6 +158,7 @@ config USB_U_SERIAL
config USB_U_ETHER
tristate
+ select GENERIC_NET_UTILS
config USB_U_AUDIO
tristate
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index 59d85d6a84a8..deedea8a19fd 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -686,18 +686,16 @@ static int eth_stop(struct net_device *net)
static int get_ether_addr(const char *str, u8 *dev_addr)
{
if (str) {
- unsigned i;
+ bool valid;
- for (i = 0; i < 6; i++) {
- unsigned char num;
+ /* Try the delimited formats first */
+ valid = parse_mac_pton(str, dev_addr, ".:");
+ if (valid && is_valid_ether_addr(dev_addr))
+ return 0;
- if ((*str == '.') || (*str == ':'))
- str++;
- num = hex_to_bin(*str++) << 4;
- num |= hex_to_bin(*str++);
- dev_addr [i] = num;
- }
- if (is_valid_ether_addr(dev_addr))
+ /* Fall back to the raw format */
+ valid = hex2bin(dev_addr, str, ETH_ALEN) == 0;
+ if (valid && is_valid_ether_addr(dev_addr))
return 0;
}
eth_random_addr(dev_addr);
--
2.50.1
next prev parent reply other threads:[~2026-11-17 9:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 9:00 [PATCH v5 0/2] usb: gadget: u_ether: fix out-of-bounds read in get_ether_addr Liu Chao
2026-11-17 9:00 ` [PATCH v5 1/2] lib/net_utils: allow mac_pton() to take a custom delimiter Liu Chao
2026-11-17 9:08 ` sashiko-bot
2026-11-17 9:00 ` Liu Chao [this message]
2026-11-17 9:08 ` [PATCH v5 2/2] usb: gadget: u_ether: fix out-of-bounds read in get_ether_addr sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117090110.3263592-3-liuc63@xiaopeng.com \
--to=liuc63@xiaopeng.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@intel.com \
--cc=davem@davemloft.net \
--cc=dbrownell@users.sourceforge.net \
--cc=edumazet@kernel.org \
--cc=fangxy@xiaopeng.com \
--cc=gregkh@linuxfoundation.org \
--cc=horms@kernel.org \
--cc=khtsai@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox