2 files changed, 7 insertions, 4 deletions

diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index 98fb7938beea..c4d75c52b4fc 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -1048,12 +1048,12 @@ static int bpf_tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
 
         while (msg_data_left(msg)) {
-                struct sk_msg_buff *m;
+                struct sk_msg_buff *m = NULL;
                 bool enospc = false;
                 int copy;
 
                 if (sk->sk_err) {
-                        err = sk->sk_err;
+                        err = -sk->sk_err;
                         goto out_err;
                 }
 
@@ -1116,8 +1116,11 @@ wait_for_sndbuf:
                 set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
 wait_for_memory:
                 err = sk_stream_wait_memory(sk, &timeo);
-                if (err)
+                if (err) {
+                        if (m && m != psock->cork)
+                                free_start_sg(sk, m);
                         goto out_err;
+                }
         }
 out_err:
         if (err < 0)
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index 9e78df207919..0c7d9e556b47 100644
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -354,7 +354,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
                 while (s->bytes_recvd < total_bytes) {
                         if (txmsg_cork) {
                                 timeout.tv_sec = 0;
-                                timeout.tv_usec = 1000;
+                                timeout.tv_usec = 300000;
                         } else {
                                 timeout.tv_sec = 1;
                                 timeout.tv_usec = 0;