netdev - [PATCH 1/1] tools/lib/libbpf.c: fix string format to allow build on arm32

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180521065940.srb4rqwaohkn43i6@vm4>
Date:   Mon, 21 May 2018 08:59:41 +0200
From:   Sirio Balmelli <sirio@...d.ch>
To:     daniel@...earbox.net
Cc:     netdev@...r.kernel.org
Subject: [PATCH 1/1] tools/lib/libbpf.c: fix string format to allow build on
 arm32

On arm32, 'cd tools/testing/selftests/bpf && make' fails with:

libbpf.c:80:10: error: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘int64_t {aka long long int}’ [-Werror=format=]
   (func)("libbpf: " fmt, ##__VA_ARGS__); \
          ^
libbpf.c:83:30: note: in expansion of macro ‘__pr’
 #define pr_warning(fmt, ...) __pr(__pr_warning, fmt, ##__VA_ARGS__)
                              ^~~~
libbpf.c:1072:3: note: in expansion of macro ‘pr_warning’
   pr_warning("map:%s value_type:%s has BTF type_size:%ld != value_size:%u\n",

To fix, include 'inttypes.h' and change format directive to 'PRIi64'.

Signed-off-by: Sirio Balmelli <sirio@...d.ch>
---
 tools/lib/bpf/libbpf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 3dbe217bf23e..e2cc8f10c188 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -48,6 +48,8 @@
 #include "bpf.h"
 #include "btf.h"
 
+#include <inttypes.h>   /* PRIi64 */
+
 #ifndef EM_BPF
 #define EM_BPF 247
 #endif
@@ -1042,7 +1044,7 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf)
 	}
 
 	if (def->key_size != key_size) {
-		pr_warning("map:%s key_type:%s has BTF type_size:%ld != key_size:%u\n",
+		pr_warning("map:%s key_type:%s has BTF type_size:%"PRIi64" != key_size:%u\n",
 			   map->name, name, key_size, def->key_size);
 		return -EINVAL;
 	}
@@ -1069,7 +1071,7 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf)
 	}
 
 	if (def->value_size != value_size) {
-		pr_warning("map:%s value_type:%s has BTF type_size:%ld != value_size:%u\n",
+		pr_warning("map:%s value_type:%s has BTF type_size:%"PRIi64" != value_size:%u\n",
 			   map->name, name, value_size, def->value_size);
 		return -EINVAL;
 	}
-- 
2.16.2