Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 1 deletions

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 7d194c0cd6cf..0c2d029c9d4c 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -425,7 +425,7 @@ alloc_encrypted:
                         ret = tls_push_record(sk, msg->msg_flags, record_type);
                         if (!ret)
                                 continue;
-                        if (ret == -EAGAIN)
+                        if (ret < 0)
                                 goto send_end;
 
                         copied -= try_to_copy;
@@ -716,6 +716,10 @@ int decrypt_skb(struct sock *sk, struct sk_buff *skb,
         nsg = skb_to_sgvec(skb, &sgin[1],
                            rxm->offset + tls_ctx->rx.prepend_size,
                            rxm->full_len - tls_ctx->rx.prepend_size);
+        if (nsg < 0) {
+                ret = nsg;
+                goto out;
+        }
 
         tls_make_aad(ctx->rx_aad_ciphertext,
                      rxm->full_len - tls_ctx->rx.overhead_size,
@@ -727,6 +731,7 @@ int decrypt_skb(struct sock *sk, struct sk_buff *skb,
                                 rxm->full_len - tls_ctx->rx.overhead_size,
                                 skb, sk->sk_allocation);
 
+out:
         if (sgin != &sgin_arr[0])
                 kfree(sgin);