1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index 1bb7321a256d..3d1e15401384 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -27,7 +27,10 @@ static int tcp_bpf_wait_data(struct sock *sk, struct sk_psock *psock,
                              int flags, long timeo, int *err)
 {
         DEFINE_WAIT_FUNC(wait, woken_wake_function);
-        int ret;
+        int ret = 0;
+
+        if (!timeo)
+                return ret;
 
         add_wait_queue(sk_sleep(sk), &wait);
         sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
@@ -528,8 +531,6 @@ static void tcp_bpf_remove(struct sock *sk, struct sk_psock *psock)
 {
         struct sk_psock_link *link;
 
-        sk_psock_cork_free(psock);
-        __sk_psock_purge_ingress_msg(psock);
         while ((link = sk_psock_link_pop(psock))) {
                 sk_psock_unlink(sk, link);
                 sk_psock_free_link(link);