[PATCH 1/1] selftest/net: fix FILE_SIZE for 32 bit architecture.
From: Maninder Singh <hidden>
Date: 2018-08-02 10:42:29
Also in:
lkml, netdev
Subsystem:
kernel selftest framework, networking [general], the rest · Maintainers:
Shuah Khan, Shuah Khan, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
FILE_SZ is defined as (1UL << 35), it will overflow for 32 bit system and logic will break. Signed-off-by: Maninder Singh <redacted> Signed-off-by: Vaneet Narang <redacted> --- tools/testing/selftests/net/tcp_mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/tcp_mmap.c b/tools/testing/selftests/net/tcp_mmap.c
index e8c5dff..1d6ca12 100644
--- a/tools/testing/selftests/net/tcp_mmap.c
+++ b/tools/testing/selftests/net/tcp_mmap.c@@ -85,7 +85,7 @@ #define MSG_ZEROCOPY 0x4000000 #endif -#define FILE_SZ (1UL << 35) +#define FILE_SZ (1ULL << 35) static int cfg_family = AF_INET6; static socklen_t cfg_alen = sizeof(struct sockaddr_in6); static int cfg_port = 8787;
@@ -134,7 +134,7 @@ void hash_zone(void *zone, unsigned int length) void *child_thread(void *arg) { - unsigned long total_mmap = 0, total = 0; + unsigned long long total_mmap = 0, total = 0; struct tcp_zerocopy_receive zc; unsigned long delta_usec; int flags = MAP_SHARED;
@@ -316,7 +316,7 @@ int main(int argc, char *argv[]) { struct sockaddr_storage listenaddr, addr; unsigned int max_pacing_rate = 0; - unsigned long total = 0; + unsigned long long total = 0; char *host = NULL; int fd, c, on = 1; char *buffer;
@@ -431,7 +431,7 @@ int main(int argc, char *argv[]) zflg = 0; } while (total < FILE_SZ) { - long wr = FILE_SZ - total; + unsigned long long wr = FILE_SZ - total; if (wr > chunk_size) wr = chunk_size;
--
1.9.1