summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank de Brabander <debrabander@gmail.com>2019-07-05 13:43:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-28 08:28:34 +0200
commitd7728216dee122a21fe8732c4f202301a07cdd60 (patch)
tree2eb0c1bbed60fff51f57034f0910b211d7bd1311
parent1cec7a0cf072a8b0039abaa88c73256f6d82bf4e (diff)
downloadlinux-stable-d7728216dee122a21fe8732c4f202301a07cdd60.tar.gz
linux-stable-d7728216dee122a21fe8732c4f202301a07cdd60.tar.bz2
linux-stable-d7728216dee122a21fe8732c4f202301a07cdd60.zip
selftests: txring_overwrite: fix incorrect test of mmap() return value
[ Upstream commit cecaa76b2919aac2aa584ce476e9fcd5b084add5 ] If mmap() fails it returns MAP_FAILED, which is defined as ((void *) -1). The current if-statement incorrectly tests if *ring is NULL. Fixes: 358be656406d ("selftests/net: add txring_overwrite") Signed-off-by: Frank de Brabander <debrabander@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/testing/selftests/net/txring_overwrite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/txring_overwrite.c b/tools/testing/selftests/net/txring_overwrite.c
index fd8b1c663c39..7d9ea039450a 100644
--- a/tools/testing/selftests/net/txring_overwrite.c
+++ b/tools/testing/selftests/net/txring_overwrite.c
@@ -113,7 +113,7 @@ static int setup_tx(char **ring)
*ring = mmap(0, req.tp_block_size * req.tp_block_nr,
PROT_READ | PROT_WRITE, MAP_SHARED, fdt, 0);
- if (!*ring)
+ if (*ring == MAP_FAILED)
error(1, errno, "mmap");
return fdt;