CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Sun Dec  1 08:16:49 UTC 2019

Modified Files:
        src/sys/dev/pci: if_age.c if_alc.c if_ale.c

Log Message:
 Use unsigned to avoid undefined behavoir. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_ale.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.64 src/sys/dev/pci/if_age.c:1.65
--- src/sys/dev/pci/if_age.c:1.64	Thu Nov 21 09:12:30 2019
+++ src/sys/dev/pci/if_age.c	Sun Dec  1 08:16:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_age.c,v 1.64 2019/11/21 09:12:30 msaitoh Exp $ */
+/*	$NetBSD: if_age.c,v 1.65 2019/12/01 08:16:49 msaitoh Exp $ */
 /*	$OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $	*/
 
 /*-
@@ -31,7 +31,7 @@
 /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.64 2019/11/21 09:12:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.65 2019/12/01 08:16:49 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -2291,7 +2291,7 @@ age_rxfilter(struct age_softc *sc)
 			goto update;
 		}
 		crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
-		mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+		mchash[crc >> 31] |= 1U << ((crc >> 26) & 0x1f);
 		ETHER_NEXT_MULTI(step, enm);
 	}
 	ETHER_UNLOCK(ec);

Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.44 src/sys/dev/pci/if_alc.c:1.45
--- src/sys/dev/pci/if_alc.c:1.44	Thu Nov 21 09:12:30 2019
+++ src/sys/dev/pci/if_alc.c	Sun Dec  1 08:16:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_alc.c,v 1.44 2019/11/21 09:12:30 msaitoh Exp $	*/
+/*	$NetBSD: if_alc.c,v 1.45 2019/12/01 08:16:49 msaitoh Exp $	*/
 /*	$OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yong...@freebsd.org>
@@ -3459,7 +3459,7 @@ alc_iff(struct alc_softc *sc)
 			goto update;
 		}
 		crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
-		mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+		mchash[crc >> 31] |= 1U << ((crc >> 26) & 0x1f);
 		ETHER_NEXT_MULTI(step, enm);
 	}
 	ETHER_UNLOCK(ec);

Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.36 src/sys/dev/pci/if_ale.c:1.37
--- src/sys/dev/pci/if_ale.c:1.36	Thu Nov 21 09:18:16 2019
+++ src/sys/dev/pci/if_ale.c	Sun Dec  1 08:16:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ale.c,v 1.36 2019/11/21 09:18:16 msaitoh Exp $	*/
+/*	$NetBSD: if_ale.c,v 1.37 2019/12/01 08:16:49 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yong...@freebsd.org>
@@ -32,7 +32,7 @@
 /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.36 2019/11/21 09:18:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.37 2019/12/01 08:16:49 msaitoh Exp $");
 
 #include "vlan.h"
 
@@ -2012,7 +2012,7 @@ ale_rxfilter(struct ale_softc *sc)
 			goto update;
 		}
 		crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
-		mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+		mchash[crc >> 31] |= 1U << ((crc >> 26) & 0x1f);
 		ETHER_NEXT_MULTI(step, enm);
 	}
 	ETHER_UNLOCK(ec);