diff --git a/0093-modfiy-accept-null-pointer-when-new-conn-receive-RST-packet-in-listening.patch b/0093-modfiy-accept-null-pointer-when-new-conn-receive-RST-packet-in-listening.patch new file mode 100644 index 0000000..df7ee1c --- /dev/null +++ b/0093-modfiy-accept-null-pointer-when-new-conn-receive-RST-packet-in-listening.patch @@ -0,0 +1,37 @@ +From dcdd7d73c6083a63fe966a68f11eddcafa3fd743 Mon Sep 17 00:00:00 2001 +From: hantwofish +Date: Thu, 14 Dec 2023 14:51:37 +0800 +Subject: [PATCH] resove null pointer + +--- + src/api/sockets.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/api/sockets.c b/src/api/sockets.c +index a9d39ae..0b3e4ea 100644 +--- a/src/api/sockets.c ++++ b/src/api/sockets.c +@@ -801,15 +801,17 @@ lwip_accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) + #endif /* GAZELLE_ENABLE */ + nsock = &sockets[newsock - LWIP_SOCKET_OFFSET]; + #if GAZELLE_ENABLE ++ int ret = 0; + struct tcp_pcb *pcb = newconn->pcb.tcp; +- if (pcb->client_rx_ring != NULL && pcb->client_tx_ring != NULL) { +- if (find_same_node_memzone(pcb, nsock) != 0) { ++ if (pcb != NULL && pcb->client_rx_ring != NULL && pcb->client_tx_ring != NULL) { ++ ret = find_same_node_memzone(pcb, nsock); ++ } ++ if (pcb == NULL || ret != 0) { + netconn_delete(newconn); + free_socket(nsock, 1); + sock_set_errno(sock, ENOTCONN); + done_socket(sock); + return -1; +- } + } + #endif + +-- +2.33.0 + diff --git a/lwip.spec b/lwip.spec index 0a4c0d5..13276ce 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: 95 +Release: 96 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -106,6 +106,7 @@ Patch9088: 0089-add-struct-gz-addr.patch Patch9089: 0090-frag-fix-coredump-when-get-netif.patch Patch9090: 0091-add-fd-log-info-and-fix-wrong-port-log-info.patch Patch9091: 0092-fix-the-coredump-issue-when-UDP-traffic-is-sent.patch +Patch9092: 0093-modfiy-accept-null-pointer-when-new-conn-receive-RST-packet-in-listening.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -136,6 +137,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Thu Dec 14 2023 hankangkang - 2.1.3-96 +- modfiy-accept-null-pointer-when-new-conn-receive-RST-packet-in-listening + * Sat Dec 9 2023 wuchangye - 2.1.3-95 - fix the coredump issue when UDP traffic is sent