packages/lwip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix null pointer when zero port listen

Browse Source
This commit is contained in:
jiangheng 2023-06-15 21:44:56 +08:00
parent 4563e66025
commit d211ff552e
2 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
0067-fix-null-pointer-when-all-zero-address-listen.patch Normal file
View File

@ -0,0 +1,100 @@
From b4a2b2799c199fb2955ecaae72e7b7dbe79e593b Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng14@huawei.com>
Date: Thu, 15 Jun 2023 21:42:04 +0800
Subject: [PATCH] fix null pointer when all zero address listen
---
src/core/tcp_in.c | 58 ++++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index 0abee30..c20c9b5 100644
--- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c
@@ -114,6 +114,36 @@ static void tcp_remove_sacks_gt(struct tcp_pcb *pcb, u32_t seq);
#endif /* TCP_OOSEQ_BYTES_LIMIT || TCP_OOSEQ_PBUFS_LIMIT */
#endif /* LWIP_TCP_SACK_OUT */
+#if GAZELLE_TCP_REUSE_IPPORT
+struct tcp_pcb_listen *min_cnts_lpcb_get(struct tcp_pcb_listen *lpcb)
+{
+ struct tcp_pcb_listen *min_cnts_lpcb;
+ struct tcp_pcb_listen *tmp_lpcb = lpcb;
+ u16_t min_conn_num = GAZELLE_TCP_MAX_CONN_PER_THREAD;
+ u8_t have_master_fd = 0;
+
+ while (tmp_lpcb != NULL) {
+ if (tmp_lpcb->master_lpcb) {
+ have_master_fd = 1;
+ }
+ tmp_lpcb = tmp_lpcb->next_same_port_pcb;
+ }
+
+ tmp_lpcb = lpcb;
+ min_cnts_lpcb = lpcb;
+ while (tmp_lpcb != NULL) {
+ if (!have_master_fd || tmp_lpcb->master_lpcb) {
+ if (tmp_lpcb->connect_num < min_conn_num) {
+ min_cnts_lpcb = tmp_lpcb;
+ min_conn_num = tmp_lpcb->connect_num;
+ }
+ tmp_lpcb = tmp_lpcb->next_same_port_pcb;
+ }
+ }
+ return min_cnts_lpcb;
+}
+#endif
+
/**
* The initial input processing of TCP. It verifies the TCP header, demultiplexes
* the segment between the PCBs and passes it on to tcp_process(), which implements
@@ -384,33 +414,15 @@ tcp_input(struct pbuf *p, struct netif *inp)
if (ip_addr_cmp(&lpcb->local_ip, ip_current_dest_addr())) {
/* found an exact match */
#if GAZELLE_TCP_REUSE_IPPORT
- // check master fd
- struct tcp_pcb_listen *tmp_lpcb = lpcb;
- u8_t have_master_fd = 0;
- while (tmp_lpcb != NULL) {
- if (tmp_lpcb->master_lpcb) {
- have_master_fd = 1;
- }
- tmp_lpcb = tmp_lpcb->next_same_port_pcb;
- }
-
- tmp_lpcb = lpcb;
- min_cnts_lpcb = lpcb;
- u16_t min_conn_num = GAZELLE_TCP_MAX_CONN_PER_THREAD;
- while (tmp_lpcb != NULL) {
- if (!have_master_fd || tmp_lpcb->master_lpcb) {
- if (tmp_lpcb->connect_num < min_conn_num) {
- min_cnts_lpcb = tmp_lpcb;
- min_conn_num = tmp_lpcb->connect_num;
- }
- }
- tmp_lpcb = tmp_lpcb->next_same_port_pcb;
- }
+ min_cnts_lpcb = min_cnts_lpcb_get(lpcb);
#endif
break;
} else if (ip_addr_isany(&lpcb->local_ip)) {
/* found an ANY-match */
#if SO_REUSE
+#if GAZELLE_TCP_REUSE_IPPORT
+ min_cnts_lpcb = min_cnts_lpcb_get(lpcb);
+#endif
lpcb_any = lpcb;
lpcb_prev = prev;
#else /* SO_REUSE */
@@ -458,7 +470,7 @@ tcp_input(struct pbuf *p, struct netif *inp)
{
#if GAZELLE_TCP_REUSE_IPPORT
tcp_listen_input(min_cnts_lpcb);
- min_cnts_lpcb->connect_num++;
+ min_cnts_lpcb->connect_num++;
#else
tcp_listen_input(lpcb);
#endif
--
2.27.0

6
lwip.spec
View File

@ -4,7 +4,7 @@
Summary: lwip is a small independent implementation of the TCP/IP protocol suite
Name: lwip
Version: 2.1.3
Release: 71
Release: 72
License: BSD
URL: http://savannah.nongnu.org/projects/lwip/
Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip
@ -78,6 +78,7 @@ Patch9062: 0063-optimize-avoid-too-many-empty-acks-in-tcp_input.patch
Patch9063: 0064-fix-udp-send-recv-in-multiple-queue.patch
Patch9064: 0065-fix-udp-recvmbox-size-not-set.patch
Patch9065: 0066-adapt-to-dpdk-19.11-and-dpdk-21.11.patch
Patch9066: 0067-fix-null-pointer-when-all-zero-address-listen.patch
BuildRequires: gcc-c++ dos2unix dpdk-devel
@ -108,6 +109,9 @@ cd %{_builddir}/%{name}-%{version}/src
%{_libdir}/liblwip.a
%changelog
* Thu Jun 15 2023 Lemmy Huang <huangliming5@huawei.com> - 2.1.3-72
- fix null pointer when zero port listen
* Thu Jun 15 2023 Lemmy Huang <huangliming5@huawei.com> - 2.1.3-71
- patch -p1 automaition in lwip.spec