From: Andrii Nakryiko <andriin@fb.com>
Date: Fri, 11 Oct 2019 17:20:53 +0000 (-0700)
Subject: bpf: Fix cast to pointer from integer of different size warning
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2dedd7d2165565bafa89718eaadfc5d1a7865f66;p=linux.git

bpf: Fix cast to pointer from integer of different size warning

Fix "warning: cast to pointer from integer of different size" when
casting u64 addr to void *.

Fixes: a23740ec43ba ("bpf: Track contents of read-only maps as scalars")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20191011172053.2980619-1-andriin@fb.com
---

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index b818fed3208d3..d3446f018b9a8 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -2753,7 +2753,7 @@ static int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val)
 	err = map->ops->map_direct_value_addr(map, &addr, off);
 	if (err)
 		return err;
-	ptr = (void *)addr + off;
+	ptr = (void *)(long)addr + off;
 
 	switch (size) {
 	case sizeof(u8):