From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net, David.Laight@aculab.com,
kernel-hardening@lists.openwall.com
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH 3/5] rxrpc: check return value of skb_to_sgvec always
Date: Tue, 25 Apr 2017 16:08:07 +0200 [thread overview]
Message-ID: <20170425140809.23881-3-Jason@zx2c4.com> (raw)
In-Reply-To: <20170425140809.23881-1-Jason@zx2c4.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
net/rxrpc/rxkad.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 4374e7b9c7bf..dcf46c9c3ece 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -229,7 +229,9 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
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))
+ goto out;
skcipher_request_set_crypt(req, sg, sg, len, iv.x);
crypto_skcipher_encrypt(req);
@@ -342,7 +344,8 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb,
goto nomem;
sg_init_table(sg, nsg);
- skb_to_sgvec(skb, sg, offset, 8);
+ if (unlikely(skb_to_sgvec(skb, sg, offset, 8) < 0))
+ goto nomem;
/* start the decryption afresh */
memset(&iv, 0, sizeof(iv));
@@ -429,7 +432,8 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb,
}
sg_init_table(sg, nsg);
- skb_to_sgvec(skb, sg, offset, len);
+ if (unlikely(skb_to_sgvec(skb, sg, offset, len) < 0))
+ goto nomem;
/* decrypt from the session key */
token = call->conn->params.key->payload.data[0];
--
2.12.2
next prev parent reply other threads:[~2017-04-25 14:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 14:08 [PATCH 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 14:08 ` Jason A. Donenfeld [this message]
2017-04-25 14:08 ` [PATCH 4/5] macsec: " Jason A. Donenfeld
2017-04-25 14:08 ` [PATCH 5/5] virtio_net: " Jason A. Donenfeld
2017-04-25 14:16 ` [PATCH v2 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 14:21 ` [PATCH v3 " Jason A. Donenfeld
2017-04-25 14:47 ` [PATCH " David Miller
2017-04-25 15:04 ` [PATCH v4 " Jason A. Donenfeld
2017-04-25 15:17 ` David Miller
2017-04-25 15:52 ` [PATCH v5 " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 3/5] rxrpc: " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 4/5] macsec: " Jason A. Donenfeld
2017-04-25 15:52 ` [PATCH v5 5/5] virtio_net: " Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 2/5] ipsec: check return value of skb_to_sgvec always Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 3/5] rxrpc: " Jason A. Donenfeld
2017-04-28 11:41 ` Sabrina Dubroca
2017-04-28 13:29 ` Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 4/5] macsec: " Jason A. Donenfeld
2017-04-25 18:47 ` [PATCH v6 5/5] virtio_net: " Jason A. Donenfeld
2017-04-27 9:21 ` [PATCH v6 1/5] skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow Jason A. Donenfeld
2017-04-27 11:30 ` Sabrina Dubroca
2017-04-27 12:04 ` Jason A. Donenfeld
2017-04-27 14:54 ` David Laight
2017-04-27 15:54 ` David Miller
2017-04-28 16:18 ` Sabrina Dubroca
2017-04-28 22:47 ` Jason A. Donenfeld
2017-04-25 15:42 ` [PATCH " Sergei Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170425140809.23881-3-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=David.Laight@aculab.com \
--cc=davem@davemloft.net \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).