From f1787120ebbee803e2b8859b8a91e6baedde61cb Mon Sep 17 00:00:00 2001 From: msaitoh Date: Thu, 25 Jul 2019 09:28:07 +0000 Subject: Fix VLAN hardware filter initialization. Use unsigned. Found by KUBSan. --- sys/dev/pci/ixgbe/ixgbe.c | 4 ++-- sys/dev/pci/ixgbe/ixv.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c index 716976257e0..62ddd3e3762 100644 --- a/sys/dev/pci/ixgbe/ixgbe.c +++ b/sys/dev/pci/ixgbe/ixgbe.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.195 2019/07/25 09:01:56 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.196 2019/07/25 09:28:07 msaitoh Exp $ */ /****************************************************************************** @@ -2427,7 +2427,7 @@ ixgbe_setup_vlan_hw_support(struct adapter *adapter) idx = vlanidp->vid / 32; KASSERT(idx < IXGBE_VFTA_SIZE); - adapter->shadow_vfta[idx] |= 1 << vlanidp->vid % 32; + adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32); } mutex_exit(ec->ec_lock); for (i = 0; i < IXGBE_VFTA_SIZE; i++) diff --git a/sys/dev/pci/ixgbe/ixv.c b/sys/dev/pci/ixgbe/ixv.c index 9280aaab539..296db70cbf5 100644 --- a/sys/dev/pci/ixgbe/ixv.c +++ b/sys/dev/pci/ixgbe/ixv.c @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.122 2019/07/25 09:01:56 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.123 2019/07/25 09:28:07 msaitoh Exp $*/ /****************************************************************************** @@ -1993,7 +1993,7 @@ ixv_setup_vlan_support(struct adapter *adapter) idx = vlanidp->vid / 32; KASSERT(idx < IXGBE_VFTA_SIZE); - adapter->shadow_vfta[idx] |= 1 << vlanidp->vid % 32; + adapter->shadow_vfta[idx] |= (u32)1 << (vlanidp->vid % 32); } mutex_exit(ec->ec_lock); @@ -2012,7 +2012,7 @@ ixv_setup_vlan_support(struct adapter *adapter) */ for (int j = 0; j < 32; j++) { retry = 0; - if ((vfta & (1 << j)) == 0) + if ((vfta & ((u32)1 << j)) == 0) continue; vid = (i * 32) + j; -- cgit