diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-02-27 18:42:17 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-02-27 18:45:01 -0800 |
| commit | 4ca88b59994faa79f88f21a347a5dbc571138c1d (patch) | |
| tree | 2d9b68deaffd63e3b8fac264d2715fde4a627138 /lib | |
| parent | 718bcce0b85e457169a4d1ab45e8afe3146d2dd4 (diff) | |
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 <blp@nicira.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dpif-linux.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 317274e3..79ba67d8 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -457,9 +457,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; |