All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Emelyanov <xemul@parallels.com>
To: David Miller <davem@davemloft.net>,
	Eric Dumazet <eric.dumazet@gmail.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Linux Netdev List <netdev@vger.kernel.org>,
	Ben Hutchings <bhutchings@solarflare.com>
Subject: [PATCH 3/5] veth: Allow to create peer link with given ifindex
Date: Thu, 09 Aug 2012 11:53:03 +0400	[thread overview]
Message-ID: <50236C5F.1010609@parallels.com> (raw)
In-Reply-To: <50236C20.4050108@parallels.com>

The ifinfomsg is in there (thanks kaber@ for foreseeing this long time ago),
so take the given ifidex and register netdev with it.

Ben noticed, that this code path previously ignored ifmp->ifi_index and
userland could be passing in garbage. Thus it may now fail occasionally
because the value clashes with an existing interface.

To address this it's assumed that if the caller specifies the ifindex for
the veth master device, then it's aware of this possibility and should
explicitly specify (or set to 0 for auto-assignment) the peer's ifindex as
well. With this the compatibility with old tools not setting ifindex is
preserved.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 drivers/net/veth.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 5852361..e522ff7 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -348,6 +348,9 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 	if (tbp[IFLA_ADDRESS] == NULL)
 		eth_hw_addr_random(peer);
 
+	if (ifmp && (dev->ifindex != 0))
+		peer->ifindex = ifmp->ifi_index;
+
 	err = register_netdevice(peer);
 	put_net(net);
 	net = NULL;
-- 
1.7.6.5

  parent reply	other threads:[~2012-08-09  7:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-09  7:52 [PATCH net-next 0/5] Per-net and on-demand link indices (and related) v3 Pavel Emelyanov
2012-08-09  7:52 ` [PATCH 1/5] net: Dont use ifindices in hash fns Pavel Emelyanov
2012-08-09  7:52 ` [PATCH 2/5] net: Allow to create links with given ifindex Pavel Emelyanov
2012-08-09  7:53 ` Pavel Emelyanov [this message]
2012-08-09  7:53 ` [PATCH 4/5] net: Make ifindex generation per-net namespace Pavel Emelyanov
2012-08-09  7:53 ` [PATCH 5/5] net: Loopback ifindex is constant now Pavel Emelyanov
2012-08-09 23:18 ` [PATCH net-next 0/5] Per-net and on-demand link indices (and related) v3 David Miller
  -- strict thread matches above, loose matches on Subject: below --
2012-08-06 10:30 [PATCH net-next 0/5] Per-net and on-demand link indices (and related) Pavel Emelyanov
2012-08-06 10:31 ` [PATCH 3/5] veth: Allow to create peer link with given ifindex 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=50236C5F.1010609@parallels.com \
    --to=xemul@parallels.com \
    --cc=bhutchings@solarflare.com \
    --cc=davem@davemloft.net \
    --cc=ebiederm@xmission.com \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.