Skip to content

Commit b591c46

Browse files
committed
Merge: net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3932 JIRA: https://issues.redhat.com/browse/RHEL-28017 CVE: CVE-2023-52528 net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> Approved-by: Chris von Recklinghausen <crecklin@redhat.com> Approved-by: John B. Wyatt IV <jwyatt@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 0fe7e5a + 2c893a8 commit b591c46

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/net/usb/smsc75xx.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
9090
ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
9191
| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
9292
0, index, &buf, 4);
93-
if (unlikely(ret < 0)) {
93+
if (unlikely(ret < 4)) {
94+
ret = ret < 0 ? ret : -ENODATA;
95+
9496
netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
9597
index, ret);
9698
return ret;

0 commit comments

Comments
 (0)