3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jason A. Donenfeld <ja...@zx2c4.com>

commit 89a5ea99662505d2d61f2a3030a6896c2cb3cdb0 upstream.

Signed-off-by: Jason A. Donenfeld <ja...@zx2c4.com>
Acked-by: David Howells <dhowe...@redhat.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
[natechancellor: backport to 3.18]
Signed-off-by: Nathan Chancellor <natechancel...@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 net/rxrpc/rxkad.c |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -209,7 +209,7 @@ static int rxkad_secure_packet_encrypt(c
        struct sk_buff *trailer;
        unsigned int len;
        u16 check;
-       int nsg;
+       int nsg, err;
 
        sp = rxrpc_skb(skb);
 
@@ -240,7 +240,9 @@ static int rxkad_secure_packet_encrypt(c
        len &= ~(call->conn->size_align - 1);
 
        sg_init_table(sg, nsg);
-       skb_to_sgvec(skb, sg, 0, len);
+       err = skb_to_sgvec(skb, sg, 0, len);
+       if (unlikely(err < 0))
+               return err;
        crypto_blkcipher_encrypt_iv(&desc, sg, sg, len);
 
        _leave(" = 0");
@@ -336,7 +338,7 @@ static int rxkad_verify_packet_auth(cons
        struct sk_buff *trailer;
        u32 data_size, buf;
        u16 check;
-       int nsg;
+       int nsg, ret;
 
        _enter("");
 
@@ -348,7 +350,9 @@ static int rxkad_verify_packet_auth(cons
                goto nomem;
 
        sg_init_table(sg, nsg);
-       skb_to_sgvec(skb, sg, 0, 8);
+       ret = skb_to_sgvec(skb, sg, 0, 8);
+       if (unlikely(ret < 0))
+               return ret;
 
        /* start the decryption afresh */
        memset(&iv, 0, sizeof(iv));
@@ -411,7 +415,7 @@ static int rxkad_verify_packet_encrypt(c
        struct sk_buff *trailer;
        u32 data_size, buf;
        u16 check;
-       int nsg;
+       int nsg, ret;
 
        _enter(",{%d}", skb->len);
 
@@ -430,7 +434,12 @@ static int rxkad_verify_packet_encrypt(c
        }
 
        sg_init_table(sg, nsg);
-       skb_to_sgvec(skb, sg, 0, skb->len);
+       ret = skb_to_sgvec(skb, sg, 0, skb->len);
+       if (unlikely(ret < 0)) {
+               if (sg != _sg)
+                       kfree(sg);
+               return ret;
+       }
 
        /* decrypt from the session key */
        token = call->conn->key->payload.data;


Reply via email to