From 412ac780acdc9ba431dc0d1a0bd0e3a81cce1f33 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 5 Jul 2019 05:48:21 +0900 Subject: [PATCH] network: fix the initial value of the counter for brvlan Fixes #12958. --- src/network/networkd-brvlan.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index f7fa84e293c..cadaaff91dd 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -53,7 +53,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint assert(br_vid_bitmap); assert(br_untagged_bitmap); - i = cnt = -1; + cnt = 0; begin = end = UINT16_MAX; for (k = 0; k < BRIDGE_VLAN_BITMAP_LEN; k++) { @@ -129,9 +129,8 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint i = j; } while (!done); } - if (!cnt) - return -EINVAL; + assert(cnt > 0); return cnt; }