Module Name: src
Committed By: msaitoh
Date: Wed Feb 5 07:24:07 UTC 2020
Modified Files:
src/sys/dev/usb: if_smsc.c
Log Message:
Cast to uint32_t to avoid undefined behavior in smsc_setmacaddress.
Found by kUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_smsc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.63 src/sys/dev/usb/if_smsc.c:1.64
--- src/sys/dev/usb/if_smsc.c:1.63 Wed Jan 29 06:35:28 2020
+++ src/sys/dev/usb/if_smsc.c Wed Feb 5 07:24:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.63 2020/01/29 06:35:28 thorpej Exp $ */
+/* $NetBSD: if_smsc.c,v 1.64 2020/02/05 07:24:07 msaitoh Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.63 2020/01/29 06:35:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.64 2020/02/05 07:24:07 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -544,7 +544,8 @@ smsc_setmacaddress(struct usbnet *un, co
DPRINTF("... %02jx:%0j2x:%02jx", addr[3], addr[4], addr[5], 0);
- val = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0];
+ val = ((uint32_t)addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8)
+ | addr[0];
if ((err = smsc_writereg(un, SMSC_MAC_ADDRL, val)) != 0)
goto done;
