From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 5 Jul 2019 07:37:34 +0000 (+0900)
Subject: network: fix issue found by UBSan
X-Git-Tag: v243-rc1~190^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a1df8c4cb3f520eef5e4c2bcc5a0e5a7de79307;p=thirdparty%2Fsystemd.git

network: fix issue found by UBSan
---

diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
index cadaaff91dd..c3c5d535ac6 100644
--- a/src/network/networkd-brvlan.c
+++ b/src/network/networkd-brvlan.c
@@ -19,12 +19,12 @@
 
 static bool is_bit_set(unsigned bit, uint32_t scope) {
         assert(bit < sizeof(scope)*8);
-        return scope & (1 << bit);
+        return scope & (UINT32_C(1) << bit);
 }
 
 static void set_bit(unsigned nr, uint32_t *addr) {
         if (nr < BRIDGE_VLAN_BITMAP_MAX)
-                addr[nr / 32] |= (((uint32_t) 1) << (nr % 32));
+                addr[nr / 32] |= (UINT32_C(1) << (nr % 32));
 }
 
 static int find_next_bit(int i, uint32_t x) {