From: Tom Herbert <tom@herbertland.com>
Date: Mon, 15 Aug 2016 23:30:22 +0000 (-0700)
Subject: ipila: Fixed unitialized variables
X-Git-Tag: v4.8.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d01b393f4fcb005586b74741da70ffbe5f77970;p=thirdparty%2Fiproute2.git

ipila: Fixed unitialized variables

Initialize locator and locator_match to zero and only do
addattr if they have been set.

Signed-off-by: Tom Herbert <tom@herbertland.com>
---

diff --git a/ip/ipila.c b/ip/ipila.c
index c30bdbf16..57f8c79ba 100644
--- a/ip/ipila.c
+++ b/ip/ipila.c
@@ -149,8 +149,8 @@ static int do_list(int argc, char **argv)
 static int ila_parse_opt(int argc, char **argv, struct nlmsghdr *n,
 			 bool adding)
 {
-	__u64 locator;
-	__u64 locator_match;
+	__u64 locator = 0;
+	__u64 locator_match = 0;
 	int ifindex = 0;
 	bool loc_set = false;
 	bool loc_match_set = false;
@@ -202,8 +202,11 @@ static int ila_parse_opt(int argc, char **argv, struct nlmsghdr *n,
 		}
 	}
 
-	addattr64(n, 1024, ILA_ATTR_LOCATOR_MATCH, locator_match);
-	addattr64(n, 1024, ILA_ATTR_LOCATOR, locator);
+	if (loc_match_set)
+		addattr64(n, 1024, ILA_ATTR_LOCATOR_MATCH, locator_match);
+
+	if (loc_set)
+		addattr64(n, 1024, ILA_ATTR_LOCATOR, locator);
 
 	if (ifindex_set)
 		addattr32(n, 1024, ILA_ATTR_IFINDEX, ifindex);