summaryrefslogtreecommitdiff
path: root/ring.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-04-30 13:32:08 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-04-30 13:32:08 +0200
commitf4821f92614bafaaee01721b3a5ffc29fe2f5365 (patch)
tree87b71ab410183ad1497e7cf6798aa7b3dc72dba3 /ring.h
parent190dc7879a1a8813f2332ee7b39b743a49ac2771 (diff)
ring: Consistently use size_t to specify ring size
The mm_len member of struct ring is of type size_t, but in the code paths leading to set it, unsigned int is used. In circumstances where unsigned int is 32 bit and size_t is 64 bit, this could lead to an integer overflow, which causes an improper ring size being mmap()'ed in mmap_ring_generic(). In order to prevent this, consistently use size_t to store the ring size, since this is also what mmap() takes as its `length' parameter. This now allows to specify ring sizes larger than 4 GiB for both netsniff-ng and trafgen (fixes #90). Reported-by: Jon Schipp <jonschipp@gmail.com> Reported-by: Michał Purzyński <michalpurzynski1@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'ring.h')
-rw-r--r--ring.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ring.h b/ring.h
index d3ccc04..acf5d59 100644
--- a/ring.h
+++ b/ring.h
@@ -67,7 +67,7 @@ static inline void next_rnd_slot(unsigned int *it, struct ring *ring)
*it = rand() % ring->layout.tp_frame_nr;
}
-static inline unsigned int ring_size(char *ifname, unsigned int size)
+static inline size_t ring_size(char *ifname, size_t size)
{
if (size > 0)
return size;