netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Pavel Emelyanov <xemul@openvz.org>, David Miller <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>, <netdev@vger.kernel.org>,
	Stephen Hemminger <shemminger@linux-foundation.org>
Subject: [PATCH] veth: Cleanly handle a missing peer_tb argument on creation.
Date: Wed, 12 Sep 2007 07:19:56 -0600	[thread overview]
Message-ID: <m17imwaumb.fsf@ebiederm.dsl.xmission.com> (raw)


I was getting strange kernel crashes when attempting to
create veth devices when I did not specify a peer argument
to /bin/ip.

So this patch defaults peer_tb to all zeros and doesn't attempt to
reuse the netlink attributes for the primary link to create the
secondary link and now I can't reproduce the failures.

Given that some of the most interesting netlink attributes to specify
like a mac address or a network device name seem are generally
the wrong thing to do this seems like the right approach.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
 drivers/net/veth.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 9e6a746..d49bd2c 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -313,7 +313,7 @@ static int veth_newlink(struct net_device *dev,
 	struct net_device *peer;
 	struct veth_priv *priv;
 	char ifname[IFNAMSIZ];
-	struct nlattr *peer_tb[IFLA_MAX + 1], **tbp;
+	struct nlattr *peer_tb[IFLA_MAX + 1];
 
 	/*
 	 * create and register peer first
@@ -322,6 +322,7 @@ static int veth_newlink(struct net_device *dev,
 	 * skip it since no info from it is useful yet
 	 */
 
+	memset(peer_tb, 0, sizeof(peer_tb));
 	if (data != NULL && data[VETH_INFO_PEER] != NULL) {
 		struct nlattr *nla_peer;
 
@@ -336,21 +337,18 @@ static int veth_newlink(struct net_device *dev,
 		err = veth_validate(peer_tb, NULL);
 		if (err < 0)
 			return err;
+	}
 
-		tbp = peer_tb;
-	} else
-		tbp = tb;
-
-	if (tbp[IFLA_IFNAME])
-		nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);
+	if (peer_tb[IFLA_IFNAME])
+		nla_strlcpy(ifname, peer_tb[IFLA_IFNAME], IFNAMSIZ);
 	else
 		snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");
 
-	peer = rtnl_create_link(dev->nd_net, ifname, &veth_link_ops, tbp);
+	peer = rtnl_create_link(dev->nd_net, ifname, &veth_link_ops, peer_tb);
 	if (IS_ERR(peer))
 		return PTR_ERR(peer);
 
-	if (tbp[IFLA_ADDRESS] == NULL)
+	if (peer_tb[IFLA_ADDRESS] == NULL)
 		random_ether_addr(peer->dev_addr);
 
 	err = register_netdevice(peer);
-- 
1.5.3.rc6.17.g1911


             reply	other threads:[~2007-09-12 13:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-12 13:19 Eric W. Biederman [this message]
2007-09-12 13:31 ` [PATCH] veth: Cleanly handle a missing peer_tb argument on creation David Miller
2007-09-12 14:15 ` Pavel Emelyanov
2007-09-12 14:48   ` Eric W. Biederman
2007-09-12 14:49     ` Pavel Emelyanov
2007-09-12 15:25       ` Eric W. Biederman
2007-09-13  6:06         ` Pavel Emelyanov
2007-09-13  9:02         ` Pavel Emelyanov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m17imwaumb.fsf@ebiederm.dsl.xmission.com \
    --to=ebiederm@xmission.com \
    --cc=davem@davemloft.net \
    --cc=kaber@trash.net \
    --cc=netdev@vger.kernel.org \
    --cc=shemminger@linux-foundation.org \
    --cc=xemul@openvz.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).