Compare commits
No commits in common. "d1b023f4eb58b230f4312f9335cbf90dfe616845" and "96c4ef3f8b936dbf2a97780f68c14dc58c82304c" have entirely different histories.
d1b023f4eb
...
96c4ef3f8b
@ -1,47 +0,0 @@
|
|||||||
From 05e4ba7b0d126eea4c04387dcf40596059ee24af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Date: Wed, 5 Jun 2024 11:57:43 +0800
|
|
||||||
Subject: [PATCH] libndp: valid route information option length
|
|
||||||
|
|
||||||
RFC 4191 specifies that the Route Information Option Length should be 1, 2,
|
|
||||||
or 3, depending on the Prefix Length. A malicious node could potentially
|
|
||||||
trigger a buffer overflow and crash the tool by sending an IPv6 router
|
|
||||||
advertisement message containing the "Route Information" option with a
|
|
||||||
"Length" field larger than 3.
|
|
||||||
|
|
||||||
To address this, add a check on the length field.
|
|
||||||
|
|
||||||
Fixes: 8296a5bf0755 ("add support for Route Information Option (rfc4191)")
|
|
||||||
Reported-by: Evgeny Vereshchagin <evverx@gmail.com>
|
|
||||||
Suggested-by: Felix Maurer <fmaurer@redhat.com>
|
|
||||||
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
|
|
||||||
|
|
||||||
Reference:https://github.com/jpirko/libndp/commit/05e4ba7b0d126eea4c04387dcf40596059ee24af
|
|
||||||
Conflict:NA
|
|
||||||
---
|
|
||||||
libndp/libndp.c | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/libndp/libndp.c b/libndp/libndp.c
|
|
||||||
index 6314717..72ec92e 100644
|
|
||||||
--- a/libndp/libndp.c
|
|
||||||
+++ b/libndp/libndp.c
|
|
||||||
@@ -1231,6 +1231,17 @@ static bool ndp_msg_opt_route_check_valid(void *opt_data)
|
|
||||||
*/
|
|
||||||
if (((ri->nd_opt_ri_prf_reserved >> 3) & 3) == 2)
|
|
||||||
return false;
|
|
||||||
+
|
|
||||||
+ /* The Length field is 1, 2, or 3 depending on the Prefix Length.
|
|
||||||
+ * If Prefix Length is greater than 64, then Length must be 3.
|
|
||||||
+ * If Prefix Length is greater than 0, then Length must be 2 or 3.
|
|
||||||
+ * If Prefix Length is zero, then Length must be 1, 2, or 3.
|
|
||||||
+ */
|
|
||||||
+ if (ri->nd_opt_ri_len > 3 ||
|
|
||||||
+ (ri->nd_opt_ri_prefix_len > 64 && ri->nd_opt_ri_len != 3) ||
|
|
||||||
+ (ri->nd_opt_ri_prefix_len > 0 && ri->nd_opt_ri_len == 1))
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
BIN
libndp-1.7.tar.gz
Normal file
BIN
libndp-1.7.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
34
libndp.spec
34
libndp.spec
@ -1,16 +1,11 @@
|
|||||||
Name: libndp
|
Name: libndp
|
||||||
Version: 1.8
|
Version: 1.7
|
||||||
Release: 3
|
Release: 3
|
||||||
Summary: Library for Neighbor Discovery Protocol
|
Summary: Library for Neighbor Discovery Protocol
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.libndp.org/
|
URL: http://www.libndp.org/
|
||||||
Source: http://www.libndp.org/files/libndp-%{version}.tar.gz
|
Source: http://www.libndp.org/files/libndp-%{version}.tar.gz
|
||||||
|
|
||||||
Patch0: backport-CVE-2024-5564.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: make
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains a library which provides a wrapper
|
This package contains a library which provides a wrapper
|
||||||
for IPv6 Neighbor Discovery Protocol. It also provides a tool
|
for IPv6 Neighbor Discovery Protocol. It also provides a tool
|
||||||
@ -40,7 +35,8 @@ Document files for libndp.
|
|||||||
%make_install
|
%make_install
|
||||||
%delete_la_and_a
|
%delete_la_and_a
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%post -p /sbin/ldconfig
|
||||||
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
@ -56,29 +52,5 @@ Document files for libndp.
|
|||||||
%{_mandir}/man8/ndptool.8*
|
%{_mandir}/man8/ndptool.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 11 2024 xingwei <xingwei14@h-partners.com> - 1.8-3
|
|
||||||
- Type:CVE
|
|
||||||
- ID:CVE-2024-5564
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:fix CVE-2024-5564
|
|
||||||
|
|
||||||
* Fri Oct 21 2022 gaihuiying <eaglegai@163.com> - 1.8-2
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:add make as BuildRequires for local rpmbuild
|
|
||||||
|
|
||||||
* Sat Mar 19 2022 xihaochen<xihaochen@h-partners.com> - 1.8-1
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:update libndp version to 1.8
|
|
||||||
|
|
||||||
* Thu May 27 2021 lijingyuan<lijingyuan3@huawei.com> - 1.7-4
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:Add the compilation dependency of gcc.
|
|
||||||
|
|
||||||
* Mon Sep 16 2019 liyongqiang<liyongqiang10@huawei.com> - 1.7-3
|
* Mon Sep 16 2019 liyongqiang<liyongqiang10@huawei.com> - 1.7-3
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: github
|
version_concrol: github
|
||||||
src_repo: jpirko/libndp
|
src_repo: jpirko/libndp
|
||||||
tag_prefix: v
|
tag_prefix: v
|
||||||
seperator: .
|
seperator: .
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user