From cb5d60b7d972289f21d4d154f09f7bff90effdcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hanno=20B=C3=B6ck?= Date: Thu, 21 May 2020 18:51:06 +0200 Subject: [PATCH] Properly check mmap return value Part-of: (cherry picked from commit be71e2fd08b364f331a7e44d34f67954f0aeebe3) --- .pick_status.json | 2 +- src/freedreno/perfcntrs/fdperf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 129127ea59c..5c3a399b0a5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1300,7 +1300,7 @@ "description": "Properly check mmap return value", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/freedreno/perfcntrs/fdperf.c b/src/freedreno/perfcntrs/fdperf.c index 3eb2f827a8d..e86595ae967 100644 --- a/src/freedreno/perfcntrs/fdperf.c +++ b/src/freedreno/perfcntrs/fdperf.c @@ -396,7 +396,7 @@ find_device(void) err(1, "could not open /dev/mem"); dev.io = mmap(0, dev.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, dev.base); - if (!dev.io) { + if (dev.io == MAP_FAILED) { close(fd); err(1, "could not map device"); }