From fd0efad0e0ebf417186f15b4486fb9df95c7beec Mon Sep 17 00:00:00 2001 From: zhengjiebing Date: Mon, 8 Jan 2024 15:31:14 +0800 Subject: [PATCH] fix wrong namelen in getaddrname --- 0101-fix-wrong-namelen-in-getaddrname.patch | 17 +++++++++++++++++ lwip.spec | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 0101-fix-wrong-namelen-in-getaddrname.patch diff --git a/0101-fix-wrong-namelen-in-getaddrname.patch b/0101-fix-wrong-namelen-in-getaddrname.patch new file mode 100644 index 0000000..b2da824 --- /dev/null +++ b/0101-fix-wrong-namelen-in-getaddrname.patch @@ -0,0 +1,17 @@ + src/api/sockets.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index 15053b3..c987a2b 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -3020,7 +3020,8 @@ lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local) + *namelen = saddr.sa.sa_len; + } + #else +- *namelen = LWIP_MIN(*namelen, sizeof(saddr)); ++ u8_t sa_len = IP_IS_V4_VAL(naddr) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6); ++ *namelen = LWIP_MIN(*namelen, sa_len); + #endif + MEMCPY(name, &saddr, *namelen); + diff --git a/lwip.spec b/lwip.spec index c2e755e..e6d3f33 100644 --- a/lwip.spec +++ b/lwip.spec @@ -4,7 +4,7 @@ Summary: lwip is a small independent implementation of the TCP/IP protocol suite Name: lwip Version: 2.1.3 -Release: 105 +Release: 106 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -114,6 +114,7 @@ Patch9096: 0097-Mod-the-issue-that-2w-connection-unable-to-establish.patch Patch9097: 0098-remove-duplicate-lwip-log.patch Patch9098: 0099-fix-rte_ring_create-time-consuming.patch Patch9099: 0100-replace-qtuple-addr-with-gz_addr_t.patch +Patch9100: 0101-fix-wrong-namelen-in-getaddrname.patch Patch6005: backport-tcp_in-fix-ooseq-update-error.patch @@ -146,7 +147,10 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog -* Tue Jan 02 2024 zhengjiebing - 2.1.3-103 +* Mon Jan 08 2024 zhengjiebing - 2.1.3-106 +- fix wrong namelen in lwip_getaddrname + +* Tue Jan 02 2024 zhengjiebing - 2.1.3-105 - replace qtuple addr with gz_addr_t * Tue Jan 02 2024 jiangheng - 2.1.3-104