!86 backport-libbpf-Fix-alen-calculation-in-libbpf_nla_dump_error.patch

From: @supercharge 
Reviewed-by: @bitcoffee 
Signed-off-by: @bitcoffee

backport-libbpf-Fix-alen-calculation-in-libbpf_nla_dump_error.patch

@@ -0,0 +1,32 @@
+From 418962b6861c0f3459400b3ea43aa6e709612f49 Mon Sep 17 00:00:00 2001
+From: Ilya Leoshkevich <iii@linux.ibm.com>
+Date: Fri, 10 Feb 2023 01:12:01 +0100
+Subject: [PATCH] libbpf: Fix alen calculation in libbpf_nla_dump_errormsg()
+
+The code assumes that everything that comes after nlmsgerr are nlattrs.
+When calculating their size, it does not account for the initial
+nlmsghdr. This may lead to accessing uninitialized memory.
+
+Fixes: bbf48c18ee0c ("libbpf: add error reporting in XDP")
+Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Link: https://lore.kernel.org/bpf/20230210001210.395194-8-iii@linux.ibm.com
+---
+ src/nlattr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nlattr.c b/src/nlattr.c
+index 3900d05..975e265 100644
+--- a/src/nlattr.c
++++ b/src/nlattr.c
+@@ -178,7 +178,7 @@ int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh)
+ 		hlen += nlmsg_len(&err->msg);
+ 
+ 	attr = (struct nlattr *) ((void *) err + hlen);
+-	alen = nlh->nlmsg_len - hlen;
++	alen = (void *)nlh + nlh->nlmsg_len - (void *)attr;
+ 
+ 	if (libbpf_nla_parse(tb, NLMSGERR_ATTR_MAX, attr, alen,
+ 			     extack_policy) != 0) {
+-- 
+

libbpf.spec

@@ -4,7 +4,7 @@
 
 Name:           %{githubname}
 Version:        %{githubver}
-Release:        5
+Release:        6
 Summary:        Libbpf library
 
 License:        LGPLv2 or BSD
@@ -26,6 +26,7 @@ Patch0009:      backport-libbpf-Fix-null-pointer-dereference-in-find_prog_by_.pa
 Patch0010:      backport-sync-start-syncing-include-uapi-linux-fcntl.h-UAPI-h.patch
 Patch0011:      backport-libbpf-Handle-size-overflow-for-ringbuf-mmap.patch
 Patch0012:      backport-libbpf-Use-page-size-as-max_entries-when-probing-rin.patch
+Patch0013:      backport-libbpf-Fix-alen-calculation-in-libbpf_nla_dump_error.patch
 
 # This package supersedes libbpf from kernel-tools,
 # which has default Epoch: 0. By having Epoch: 1
@@ -78,6 +79,10 @@ developing applications that use %{name}
 %{_libdir}/libbpf.a
 
 %changelog
+* Thu May 4 2023 SuperCharge <xiesongyang@huawei.com> -2:0.8.1-6
+- backport patches from upstream:
+  backport-libbpf-Fix-alen-calculation-in-libbpf_nla_dump_error.patch
+  
 * Thu May 4 2023 zhangmingyi <zhangmingyi5@huawei.com> -2:0.8.1-5 
 - add -Werror -Wl,-z,noexecstack options