diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2020-03-08 14:10:24 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2020-03-08 14:10:24 +0000 |
| commit | 76b4308478ef82e9bbc7e41ce090fa58a5344f07 (patch) | |
| tree | 02c408b9c96d64f0b7298264ee9f392a6d7d3b6e /sys/dev | |
| parent | c2bdefab570baa7f6103736b1cd7fd389f6bd26d (diff) | |
Use unsigned to avoid undefined behavior. Found by kUBSan.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_nfe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 09d7b6c6925..bfd8d15df4f 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_nfe.c,v 1.76 2020/03/01 16:31:01 thorpej Exp $ */ +/* $NetBSD: if_nfe.c,v 1.77 2020/03/08 14:10:24 msaitoh Exp $ */ /* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */ /*- @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.76 2020/03/01 16:31:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.77 2020/03/08 14:10:24 msaitoh Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -1924,11 +1924,11 @@ done: addr[0] |= 0x01; /* make sure multicast bit is set */ NFE_WRITE(sc, NFE_MULTIADDR_HI, - addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]); + (uint32_t)addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]); NFE_WRITE(sc, NFE_MULTIADDR_LO, addr[5] << 8 | addr[4]); NFE_WRITE(sc, NFE_MULTIMASK_HI, - mask[3] << 24 | mask[2] << 16 | mask[1] << 8 | mask[0]); + (uint32_t)mask[3] << 24 | mask[2] << 16 | mask[1] << 8 | mask[0]); NFE_WRITE(sc, NFE_MULTIMASK_LO, mask[5] << 8 | mask[4]); @@ -1971,7 +1971,7 @@ nfe_set_macaddr(struct nfe_softc *sc, const uint8_t *addr) NFE_WRITE(sc, NFE_MACADDR_LO, addr[5] << 8 | addr[4]); NFE_WRITE(sc, NFE_MACADDR_HI, - addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]); + (uint32_t)addr[3] << 24 | addr[2] << 16 | addr[1] << 8 | addr[0]); } void |
