From 33db1592447e46ee99cc726d2186b3fda44294de Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 27 Feb 2012 18:42:17 -0800 Subject: [PATCH] dpif-linux: Make dpif_linux_port_query_by_name() query only one datapath. The kernel will report a vport with the given name in any datapath, but userspace only wants a vport with the given name in a specific datapath. Receiving information on a vport in an unexpected datapath yields bizarre and hard-to-debug problems. Bug #9889. Signed-off-by: Ben Pfaff --- lib/dpif-linux.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index ad67ae76..7013bc54 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -418,9 +418,15 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, error = dpif_linux_vport_transact(&request, &reply, &buf); if (!error) { - dpif_port->name = xstrdup(reply.name); - dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); - dpif_port->port_no = reply.port_no; + if (reply.dp_ifindex != request.dp_ifindex) { + /* A query by name reported that 'port_name' is in some datapath + * other than 'dpif', but the caller wants to know about 'dpif'. */ + error = ENODEV; + } else { + dpif_port->name = xstrdup(reply.name); + dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); + dpif_port->port_no = reply.port_no; + } ofpbuf_delete(buf); } return error; -- 2.30.2