openharmony/kernel_linux_common_modules
1
0
Fork 0
mirror of https://github.com/openharmony/kernel_linux_common_modules.git synced 2026-08-27 01:31:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!6 Fix NewIP ofo and SELinux issues

Browse Source 
Merge pull request !6 from 史云飞/master
This commit is contained in:
openharmony_ci
2023-04-20 02:31:32 +00:00
committed by Gitee
parent df04ff6425 a83d703dba
commit ce7d12b6f2
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
newip/src/linux-5.10/net/newip/tcp_nip_input.c
+16 -1
View File
@@ -340,7 +340,15 @@ coalesce_done:
goto insert;
}
if (after(seq, TCP_SKB_CB(tp->ooo_last_skb)->seq)) {
if (!before(seq, TCP_SKB_CB(tp->ooo_last_skb)->seq)) {
if (!after(end_seq, TCP_SKB_CB(tp->ooo_last_skb)->end_seq)) {
/* ooo_last_skb->seq <= seq, end_seq <= ooo_last_skb->end_seq */
nip_dbg("ooo_last_skb completely overlapping new skb, drop pkt");
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE);
tcp_nip_drop(sk, skb);
skb = NULL;
goto end;
}
tcp_nip_left_overlap(skb, tp->ooo_last_skb);
if (tcp_nip_ooo_try_coalesce(sk, tp->ooo_last_skb, skb, &fragstolen)) {
nip_dbg("ofo skb coalesce ooo_last_skb done");
@@ -1074,6 +1082,13 @@ int _tcp_nip_conn_request(struct request_sock_ops *rsk_ops,
af_ops->init_req(req, sk, skb);
/* Based on the security context of the socket and packet,
* this function calculates the security context of the connection
* and checks whether establishing a TCP connection is permitted.
*/
if (security_inet_conn_request(sk, skb, req))
goto drop_and_free;
if (!isn)
isn = af_ops->init_seq(skb);