Module Name: src
Committed By: msaitoh
Date: Mon Oct 11 15:11:07 UTC 2021
Modified Files:
src/sys/dev/pci: if_rge.c
Log Message:
Use unsigned to avoid undefined behavior. Found by kUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/if_rge.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_rge.c
diff -u src/sys/dev/pci/if_rge.c:1.20 src/sys/dev/pci/if_rge.c:1.21
--- src/sys/dev/pci/if_rge.c:1.20 Mon Oct 11 15:10:19 2021
+++ src/sys/dev/pci/if_rge.c Mon Oct 11 15:11:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rge.c,v 1.20 2021/10/11 15:10:19 msaitoh Exp $ */
+/* $NetBSD: if_rge.c,v 1.21 2021/10/11 15:11:07 msaitoh Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.20 2021/10/11 15:10:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.21 2021/10/11 15:11:07 msaitoh Exp $");
#include <sys/types.h>
@@ -1503,9 +1503,9 @@ rge_iff(struct rge_softc *sc)
ETHER_ADDR_LEN) >> 26;
if (h < 32)
- hashes[0] |= (1 << h);
+ hashes[0] |= (1U << h);
else
- hashes[1] |= (1 << (h - 32));
+ hashes[1] |= (1U << (h - 32));
ETHER_NEXT_MULTI(step, enm);
}
@@ -2068,7 +2068,7 @@ rge_set_macaddr(struct rge_softc *sc, co
{
RGE_SETBIT_1(sc, RGE_EECMD, RGE_EECMD_WRITECFG);
RGE_WRITE_4(sc, RGE_MAC0,
- addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]);
+ (uint32_t)addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]);
RGE_WRITE_4(sc, RGE_MAC4,
addr[5] << 8 | addr[4]);
RGE_CLRBIT_1(sc, RGE_EECMD, RGE_EECMD_WRITECFG);
