Merge: tcp: stable backports from upstream for 10.1 phase 2

CKI KWF Bot · CKI KWF Bot · commit 354a01823db3 · 2025-07-04T20:05:51.000-04:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1125 JIRA: https://issues.redhat.com/browse/RHEL-96601 Addressing a single critical issue Signed-off-by: Paolo Abeni <pabeni@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: Hangbin Liu <haliu@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
@@ -435,7 +435,7 @@ static void tcp4_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,
 				       iif, sdif);
 	NAPI_GRO_CB(skb)->is_flist = !sk;
 	if (sk)
-		sock_put(sk);
+		sock_gen_put(sk);
 }
 
 INDIRECT_CALLABLE_SCOPE
diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c
@@ -42,7 +42,7 @@ static void tcp6_check_fraglist_gro(struct list_head *head, struct sk_buff *skb,
 					iif, sdif);
 	NAPI_GRO_CB(skb)->is_flist = !sk;
 	if (sk)
-		sock_put(sk);
+		sock_gen_put(sk);
 #endif /* IS_ENABLED(CONFIG_IPV6) */
 }
 

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ static void tcp4_check_fraglist_gro(struct list_head head, struct sk_buff skb,`
`435`	`435`	`iif, sdif);`
`436`	`436`	`NAPI_GRO_CB(skb)->is_flist = !sk;`
`437`	`437`	`if (sk)`
`438`		`- sock_put(sk);`
	`438`	`+ sock_gen_put(sk);`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`INDIRECT_CALLABLE_SCOPE`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static void tcp6_check_fraglist_gro(struct list_head head, struct sk_buff skb,`
`42`	`42`	`iif, sdif);`
`43`	`43`	`NAPI_GRO_CB(skb)->is_flist = !sk;`
`44`	`44`	`if (sk)`
`45`		`- sock_put(sk);`
	`45`	`+ sock_gen_put(sk);`
`46`	`46`	`#endif /* IS_ENABLED(CONFIG_IPV6) */`
`47`	`47`	`}`
`48`	`48`