Module Name: src
Committed By: msaitoh
Date: Mon Aug 5 13:30:21 UTC 2019
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Cast uint32_t to avoid undefined behavior in bridge_rthash(). Found by kUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.164 src/sys/net/if_bridge.c:1.165
--- src/sys/net/if_bridge.c:1.164 Sat Dec 22 04:28:30 2018
+++ src/sys/net/if_bridge.c Mon Aug 5 13:30:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.164 2018/12/22 04:28:30 rin Exp $ */
+/* $NetBSD: if_bridge.c,v 1.165 2019/08/05 13:30:21 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.164 2018/12/22 04:28:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.165 2019/08/05 13:30:21 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -2517,7 +2517,7 @@ bridge_rthash(struct bridge_softc *sc, c
b += addr[5] << 8;
b += addr[4];
- a += addr[3] << 24;
+ a += (uint32_t)addr[3] << 24;
a += addr[2] << 16;
a += addr[1] << 8;
a += addr[0];
