34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 3745a20b2802cb215de0b3d4e289777209c73e16 Mon Sep 17 00:00:00 2001
|
|
From: Xin Liu <liuxin350@huawei.com>
|
|
Date: Fri, 30 Sep 2022 17:07:08 +0800
|
|
Subject: [PATCH] libbpf: Fix overrun in netlink attribute iteration
|
|
|
|
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
|
|
---
|
|
src/nlattr.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/nlattr.c b/src/nlattr.c
|
|
index f57e77a..3900d05 100644
|
|
--- a/src/nlattr.c
|
|
+++ b/src/nlattr.c
|
|
@@ -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;
|
|
}
|
|
--
|
|
2.33.0
|
|
|