lan78xx_read_reg() and lan78xx_read_stats() read from the device into
a freshly kmalloc()ed buffer, but only treat a negative return value
from usb_control_msg() as an error. A device that answers with fewer
bytes than requested leaves part or all of the buffer uninitialized,
and those bytes are then used as the register value or the counters.
Treat a short transfer as -EIO in both helpers. lan78xx_write_reg()
does not use uninitialized data, since it fills its buffer before the
transfer, but make it fail on a short transfer as well, so that all the
register helpers report a partial transfer as an error.
Found by code review with LLM assistance and reproduced with an
emulated USB device (raw-gadget + dummy_hcd).
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Wei Jie Law <redacted>
---
Notes:
This patch depends on the previous one. Without it, a failed statistics
read would make lan78xx_update_stats() compute the counters from its
uninitialized on-stack buffer, so the leak would move from the heap to the
stack.
drivers/net/usb/lan78xx.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 76c2d98b49df..4a58febcddcf 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -612,6 +612,9 @@ static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
USB_VENDOR_REQUEST_READ_REGISTER,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0, index, buf, 4, USB_CTRL_GET_TIMEOUT);
+ if (ret >= 0 && ret != sizeof(*buf))
+ ret = -EIO;
+
if (likely(ret >= 0)) {
le32_to_cpus(buf);
*data = *buf;@@ -645,6 +648,9 @@ static int lan78xx_write_reg(struct lan78xx_net *dev, u32 index, u32 data)
USB_VENDOR_REQUEST_WRITE_REGISTER,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0, index, buf, 4, USB_CTRL_SET_TIMEOUT);
+ if (ret >= 0 && ret != sizeof(*buf))
+ ret = -EIO;
+
if (unlikely(ret < 0) &&
net_ratelimit()) {
netdev_warn(dev->net,@@ -695,6 +701,9 @@ static int lan78xx_read_stats(struct lan78xx_net *dev,
(void *)stats,
sizeof(*stats),
USB_CTRL_SET_TIMEOUT);
+ if (ret >= 0 && ret != sizeof(*stats))
+ ret = -EIO;
+
if (likely(ret >= 0)) {
src = (u32 *)stats;
dst = (u32 *)data;--
2.43.0