diff options
author | luigi <luigi@FreeBSD.org> | 2014-06-06 15:17:19 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2014-06-06 15:17:19 +0000 |
commit | 55c24573f460d0fcac60de72255fff1745dd4302 (patch) | |
tree | d91f8ed304226ca06601e459bce0ae5b0bb0ed35 /sys/net/netmap_user.h | |
parent | d33a7e50b0743ff3f5d74902d2112cc5b3d9493b (diff) | |
download | FreeBSD-src-55c24573f460d0fcac60de72255fff1745dd4302.zip FreeBSD-src-55c24573f460d0fcac60de72255fff1745dd4302.tar.gz |
misc bugfixes:
- stdio.h is needed for fprint()
- make memsize uint32_t to avoid errors due to overflow
- honor the *XPOLL flagg in NIOCREGIF requests
- mmap fails wit MAP_FAILED, not NULL.
MFC after: 3 days
Diffstat (limited to 'sys/net/netmap_user.h')
-rw-r--r-- | sys/net/netmap_user.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h index c9695c2..9e0ab43 100644 --- a/sys/net/netmap_user.h +++ b/sys/net/netmap_user.h @@ -133,6 +133,7 @@ nm_ring_space(struct netmap_ring *ring) #ifndef HAVE_NETMAP_WITH_LIBS #define HAVE_NETMAP_WITH_LIBS +#include <stdio.h> #include <sys/time.h> #include <sys/mman.h> #include <string.h> /* memset */ @@ -192,7 +193,7 @@ struct nm_desc { struct nm_desc *self; /* point to self if netmap. */ int fd; void *mem; - int memsize; + uint32_t memsize; int done_mmap; /* set if mem is the result of mmap */ struct netmap_if * const nifp; uint16_t first_tx_ring, last_tx_ring, cur_tx_ring; @@ -404,8 +405,6 @@ nm_open(const char *ifname, const struct nmreq *req, errmsg = "invalid ringid"; goto fail; } - /* add the *XPOLL flags */ - nr_ringid |= new_flags & (NETMAP_NO_TX_POLL | NETMAP_DO_RX_POLL); d = (struct nm_desc *)calloc(1, sizeof(*d)); if (d == NULL) { @@ -461,6 +460,9 @@ nm_open(const char *ifname, const struct nmreq *req, d->req.nr_flags = parent->req.nr_flags; } } + /* add the *XPOLL flags */ + d->req.nr_ringid |= new_flags & (NETMAP_NO_TX_POLL | NETMAP_DO_RX_POLL); + if (ioctl(d->fd, NIOCREGIF, &d->req)) { errmsg = "NIOCREGIF failed"; goto fail; @@ -472,10 +474,11 @@ nm_open(const char *ifname, const struct nmreq *req, d->memsize = parent->memsize; d->mem = parent->mem; } else { + /* XXX TODO: check if memsize is too large (or there is overflow) */ d->memsize = d->req.nr_memsize; d->mem = mmap(0, d->memsize, PROT_WRITE | PROT_READ, MAP_SHARED, d->fd, 0); - if (d->mem == NULL) { + if (d->mem == MAP_FAILED) { errmsg = "mmap failed"; goto fail; } |