mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-27 15:18:06 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Don't close(0) when closing an ordinary netdev.

Browse Source 
Calling close(0) at random points is bad.  It means that the next call to
socket() or open() returns fd 0.  Then the next time a netdev gets closed,
that socket or file fd gets closed too, and you end up with weird "Bad
file descriptor" errors.

Found by installing the following as lib/unistd.h in the source tree:

#ifndef UNISTD_H
#define UNISTD_H 1

#include <stdlib.h>
#include_next <unistd.h>

#undef close
#define close(fd) rpl_close(fd)

static inline int rpl_close(int fd)
{
    if (!fd) {
        abort();
    }
    return (close)(fd);
}

#endif
This commit is contained in:
Ben Pfaff
2010-01-15 14:06:15 -08:00
parent f3ac83df5c
commit 88258e0034
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/netdev-linux.c
View File

@@ -821,7 +821,6 @@ netdev_linux_open(struct netdev_dev *netdev_dev_, int ethertype,
if (!strcmp(netdev_dev_get_type(netdev_dev_), "tap")) { if (!strcmp(netdev_dev_get_type(netdev_dev_), "tap")) {
netdev->fd = netdev_dev->state.tap.fd; netdev->fd = netdev_dev->state.tap.fd;
} else if (ethertype != NETDEV_ETH_TYPE_NONE) { } else if (ethertype != NETDEV_ETH_TYPE_NONE) {
struct sockaddr_ll sll; struct sockaddr_ll sll;
int protocol; int protocol;
@@ -869,6 +868,8 @@ netdev_linux_open(struct netdev_dev *netdev_dev_, int ethertype,
if (error) { if (error) {
goto error; goto error;
} }
} else {
netdev->fd = -1;
} }
*netdevp = &netdev->netdev; *netdevp = &netdev->netdev;