[PATCH 2/2] Handle netdev group for veth peer too

[PATCH 2/2] Handle netdev group for veth peer too

[Sergey Popovich]

Currently ip-link(8) parses, but ignores "group" argument to
peer interface on veth creation.

Insert IFLA_GROUP attribute for peer interface when present.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
---
 ip/link_veth.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/ip/link_veth.c b/ip/link_veth.c
index 7730f39..98ff6a5 100644
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -53,6 +53,9 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
 		addattr_l(hdr, 1024, IFLA_IFNAME, name, len);
 	}
 
+	if (group != -1)
+		addattr32(hdr, 1024, IFLA_GROUP, group);
+
 	data->rta_len = (void *)NLMSG_TAIL(hdr) - (void *)data;
 	return argc - 1 - err;
 }
-- 
1.7.10.4

[PATCH 1/2] Initialize arguments to iplink_parse() by default

[Sergey Popovich]

Be consistent when dealing with arguments passed
to iplink_parse() by initializing to default values.

This fixes crash when ip-link(8) invoced with command:

  ip link add dev veth1a type veth peer

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>
---
 ip/iplink.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ip/iplink.c b/ip/iplink.c
index 58b6c20..9735c54 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -299,6 +299,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
 	int numtxqueues = -1;
 	int numrxqueues = -1;
 
+	*name = *type = *link = *dev = NULL;
 	*group = -1;
 	ret = argc;
 
@@ -498,15 +499,11 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
 
 static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
 {
-	int len;
-	char *dev = NULL;
-	char *name = NULL;
-	char *link = NULL;
-	char *type = NULL;
+	char *name, *type, *link, *dev;
 	int group;
 	struct link_util *lu = NULL;
 	struct iplink_req req;
-	int ret;
+	int len, ret;
 
 	memset(&req, 0, sizeof(req));
 
-- 
1.7.10.4

Re: [PATCH 1/2] Initialize arguments to iplink_parse() by default

[Stephen Hemminger]

> Be consistent when dealing with arguments passed
> to iplink_parse() by initializing to default values.
> 
> This fixes crash when ip-link(8) invoced with command:
> 
>   ip link add dev veth1a type veth peer
> 
> Signed-off-by: Sergey Popovich <popovich_sergei@mail.ru>

Rather than modifying iplink_parse, I just fixed in veth code where the bug
was being caused.