Module Name: src
Committed By: msaitoh
Date: Thu Aug 1 14:28:34 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Use unsigned to avoid undefined behavior in wm_i82543_mii_sendbits().
Found by kUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.645 -r1.646 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645 src/sys/dev/pci/if_wm.c:1.646
--- src/sys/dev/pci/if_wm.c:1.645 Tue Jul 30 04:42:29 2019
+++ src/sys/dev/pci/if_wm.c Thu Aug 1 14:28:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645 2019/07/30 04:42:29 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.646 2019/08/01 14:28:33 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645 2019/07/30 04:42:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.646 2019/08/01 14:28:33 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -10413,7 +10413,7 @@ wm_i82543_mii_sendbits(struct wm_softc *
v &= ~(MDI_IO | MDI_CLK | (CTRL_SWDPIO_MASK << CTRL_SWDPIO_SHIFT));
v |= MDI_DIR | CTRL_SWDPIO(3);
- for (i = 1 << (nbits - 1); i != 0; i >>= 1) {
+ for (i = __BIT(nbits - 1); i != 0; i >>= 1) {
if (data & i)
v |= MDI_IO;
else
