libbpf: Fix overrun in netlink attribute iteration
authorXin Liu <liuxin350@huawei.com>
Fri, 30 Sep 2022 09:07:08 +0000 (17:07 +0800)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 30 Sep 2022 22:16:22 +0000 (15:16 -0700)
I accidentally found that a change in commit 1045b03e07d8 ("netlink: fix
overrun in attribute iteration") was not synchronized to the function
`nla_ok` in tools/lib/bpf/nlattr.c, I think it is necessary to modify,
this patch will do it.

Signed-off-by: Xin Liu <liuxin350@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220930090708.62394-1-liuxin350@huawei.com
tools/lib/bpf/nlattr.c

index f57e77a6e40fdfb9d0b972f651e75617e6d5abe4..3900d052ed19ea651c314fb9205e89f495fa71c1 100644 (file)
@@ -32,7 +32,7 @@ static struct nlattr *nla_next(const struct nlattr *nla, int *remaining)
 
 static int nla_ok(const struct nlattr *nla, int remaining)
 {
-       return remaining >= sizeof(*nla) &&
+       return remaining >= (int)sizeof(*nla) &&
               nla->nla_len >= sizeof(*nla) &&
               nla->nla_len <= remaining;
 }