* [PATCH 3.18] ipsec: check return value of skb_to_sgvec always
2018-04-09 18:05 Backport of 3f29770723fe Nathan Chancellor
@ 2018-04-09 18:05 ` Nathan Chancellor
2018-04-09 18:05 ` [PATCH 4.4] " Nathan Chancellor
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Nathan Chancellor @ 2018-04-09 18:05 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable
Cc: Jason A. Donenfeld, Steffen Klassert, Herbert Xu, David S. Miller,
Nathan Chancellor
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[nc: Adjust context due to lack of 000ae7b2690e2 and fca11ebde3f0]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
net/ipv4/ah4.c | 8 ++++++--
net/ipv4/esp4.c | 12 ++++++++----
net/ipv6/ah6.c | 8 ++++++--
net/ipv6/esp6.c | 12 ++++++++----
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 0157f09c0de9..00de0e81eb64 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -220,7 +220,9 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -391,7 +393,9 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
skb_push(skb, ihl);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 360b565918c4..1ccd3466f89a 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -239,9 +239,11 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- esph->enc_data + crypto_aead_ivsize(aead) - skb->data,
- clen + alen);
+ err = skb_to_sgvec(skb, sg,
+ esph->enc_data + crypto_aead_ivsize(aead) - skb->data,
+ clen + alen);
+ if (unlikely(err < 0))
+ goto error;
if ((x->props.flags & XFRM_STATE_ESN)) {
sg_init_table(asg, 3);
@@ -426,7 +428,9 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
iv = esph->enc_data;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, sizeof(*esph) + crypto_aead_ivsize(aead), elen);
+ err = skb_to_sgvec(skb, sg, sizeof(*esph) + crypto_aead_ivsize(aead), elen);
+ if (unlikely(err < 0))
+ goto out;
if ((x->props.flags & XFRM_STATE_ESN)) {
sg_init_table(asg, 3);
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 6d16eb0e0c7f..a472dbd3344b 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -423,7 +423,9 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -601,7 +603,9 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
ip6h->hop_limit = 0;
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 83fc3a385a26..8871a98845c7 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -231,9 +231,11 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- esph->enc_data + crypto_aead_ivsize(aead) - skb->data,
- clen + alen);
+ err = skb_to_sgvec(skb, sg,
+ esph->enc_data + crypto_aead_ivsize(aead) - skb->data,
+ clen + alen);
+ if (unlikely(err < 0))
+ goto error;
if ((x->props.flags & XFRM_STATE_ESN)) {
sg_init_table(asg, 3);
@@ -381,7 +383,9 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
iv = esph->enc_data;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, sizeof(*esph) + crypto_aead_ivsize(aead), elen);
+ ret = skb_to_sgvec(skb, sg, sizeof(*esph) + crypto_aead_ivsize(aead), elen);
+ if (unlikely(ret < 0))
+ goto out;
if ((x->props.flags & XFRM_STATE_ESN)) {
sg_init_table(asg, 3);
--
2.16.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4.4] ipsec: check return value of skb_to_sgvec always
2018-04-09 18:05 Backport of 3f29770723fe Nathan Chancellor
2018-04-09 18:05 ` [PATCH 3.18] ipsec: check return value of skb_to_sgvec always Nathan Chancellor
@ 2018-04-09 18:05 ` Nathan Chancellor
2018-04-09 18:05 ` [PATCH 4.9] " Nathan Chancellor
2018-04-10 12:53 ` Backport of 3f29770723fe Greg Kroah-Hartman
3 siblings, 0 replies; 8+ messages in thread
From: Nathan Chancellor @ 2018-04-09 18:05 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable
Cc: Jason A. Donenfeld, Steffen Klassert, Herbert Xu, David S. Miller,
Nathan Chancellor
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[natechancellor: Adjusted context due to lack of fca11ebde3f0]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
net/ipv4/ah4.c | 8 ++++++--
net/ipv4/esp4.c | 13 ++++++++-----
net/ipv6/ah6.c | 8 ++++++--
net/ipv6/esp6.c | 12 ++++++++----
4 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 22377c8ff14b..e8f862358518 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -220,7 +220,9 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -393,7 +395,9 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
skb_push(skb, ihl);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 20fb25e3027b..3d8021d55336 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -268,10 +268,11 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
esph->spi = x->id.spi;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- (unsigned char *)esph - skb->data,
- assoclen + ivlen + clen + alen);
-
+ err = skb_to_sgvec(skb, sg,
+ (unsigned char *)esph - skb->data,
+ assoclen + ivlen + clen + alen);
+ if (unlikely(err < 0))
+ goto error;
aead_request_set_crypt(req, sg, sg, ivlen + clen, iv);
aead_request_set_ad(req, assoclen);
@@ -481,7 +482,9 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
}
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, 0, skb->len);
+ err = skb_to_sgvec(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out;
aead_request_set_crypt(req, sg, sg, elen + ivlen, iv);
aead_request_set_ad(req, assoclen);
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 0630a4d5daaa..0edc44cb254e 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -423,7 +423,9 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -603,7 +605,9 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
ip6h->hop_limit = 0;
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 111ba55fd512..6a924be66e37 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -248,9 +248,11 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
esph->spi = x->id.spi;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- (unsigned char *)esph - skb->data,
- assoclen + ivlen + clen + alen);
+ err = skb_to_sgvec(skb, sg,
+ (unsigned char *)esph - skb->data,
+ assoclen + ivlen + clen + alen);
+ if (unlikely(err < 0))
+ goto error;
aead_request_set_crypt(req, sg, sg, ivlen + clen, iv);
aead_request_set_ad(req, assoclen);
@@ -423,7 +425,9 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
}
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, 0, skb->len);
+ ret = skb_to_sgvec(skb, sg, 0, skb->len);
+ if (unlikely(ret < 0))
+ goto out;
aead_request_set_crypt(req, sg, sg, elen + ivlen, iv);
aead_request_set_ad(req, assoclen);
--
2.16.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4.9] ipsec: check return value of skb_to_sgvec always
2018-04-09 18:05 Backport of 3f29770723fe Nathan Chancellor
2018-04-09 18:05 ` [PATCH 3.18] ipsec: check return value of skb_to_sgvec always Nathan Chancellor
2018-04-09 18:05 ` [PATCH 4.4] " Nathan Chancellor
@ 2018-04-09 18:05 ` Nathan Chancellor
2018-04-09 20:25 ` Greg Kroah-Hartman
2018-04-10 12:53 ` Backport of 3f29770723fe Greg Kroah-Hartman
3 siblings, 1 reply; 8+ messages in thread
From: Nathan Chancellor @ 2018-04-09 18:05 UTC (permalink / raw)
To: Greg Kroah-Hartman, stable
Cc: Jason A. Donenfeld, Steffen Klassert, Herbert Xu, David S. Miller,
Nathan Chancellor
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[natechancellor: Adjusted context due to lack of fca11ebde3f0]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
net/ipv4/ah4.c | 8 ++++++--
net/ipv4/esp4.c | 13 ++++++++-----
net/ipv6/ah6.c | 8 ++++++--
net/ipv6/esp6.c | 12 ++++++++----
4 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 22377c8ff14b..e8f862358518 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -220,7 +220,9 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -393,7 +395,9 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
skb_push(skb, ihl);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 20fb25e3027b..3d8021d55336 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -268,10 +268,11 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
esph->spi = x->id.spi;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- (unsigned char *)esph - skb->data,
- assoclen + ivlen + clen + alen);
-
+ err = skb_to_sgvec(skb, sg,
+ (unsigned char *)esph - skb->data,
+ assoclen + ivlen + clen + alen);
+ if (unlikely(err < 0))
+ goto error;
aead_request_set_crypt(req, sg, sg, ivlen + clen, iv);
aead_request_set_ad(req, assoclen);
@@ -481,7 +482,9 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
}
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, 0, skb->len);
+ err = skb_to_sgvec(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out;
aead_request_set_crypt(req, sg, sg, elen + ivlen, iv);
aead_request_set_ad(req, assoclen);
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 0630a4d5daaa..0edc44cb254e 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -423,7 +423,9 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
@@ -603,7 +605,9 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
ip6h->hop_limit = 0;
sg_init_table(sg, nfrags + sglists);
- skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
+ if (unlikely(err < 0))
+ goto out_free;
if (x->props.flags & XFRM_STATE_ESN) {
/* Attach seqhi sg right after packet payload */
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 111ba55fd512..6a924be66e37 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -248,9 +248,11 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
esph->spi = x->id.spi;
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg,
- (unsigned char *)esph - skb->data,
- assoclen + ivlen + clen + alen);
+ err = skb_to_sgvec(skb, sg,
+ (unsigned char *)esph - skb->data,
+ assoclen + ivlen + clen + alen);
+ if (unlikely(err < 0))
+ goto error;
aead_request_set_crypt(req, sg, sg, ivlen + clen, iv);
aead_request_set_ad(req, assoclen);
@@ -423,7 +425,9 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
}
sg_init_table(sg, nfrags);
- skb_to_sgvec(skb, sg, 0, skb->len);
+ ret = skb_to_sgvec(skb, sg, 0, skb->len);
+ if (unlikely(ret < 0))
+ goto out;
aead_request_set_crypt(req, sg, sg, elen + ivlen, iv);
aead_request_set_ad(req, assoclen);
--
2.16.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 4.9] ipsec: check return value of skb_to_sgvec always
2018-04-09 18:05 ` [PATCH 4.9] " Nathan Chancellor
@ 2018-04-09 20:25 ` Greg Kroah-Hartman
2018-04-10 6:23 ` Nathan Chancellor
0 siblings, 1 reply; 8+ messages in thread
From: Greg Kroah-Hartman @ 2018-04-09 20:25 UTC (permalink / raw)
To: Nathan Chancellor
Cc: stable, Jason A. Donenfeld, Steffen Klassert, Herbert Xu,
David S. Miller
On Mon, Apr 09, 2018 at 11:05:25AM -0700, Nathan Chancellor wrote:
> From: "Jason A. Donenfeld" <Jason@zx2c4.com>
>
> commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> Cc: Steffen Klassert <steffen.klassert@secunet.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> [natechancellor: Adjusted context due to lack of fca11ebde3f0]
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
> net/ipv4/ah4.c | 8 ++++++--
> net/ipv4/esp4.c | 13 ++++++++-----
> net/ipv6/ah6.c | 8 ++++++--
> net/ipv6/esp6.c | 12 ++++++++----
> 4 files changed, 28 insertions(+), 13 deletions(-)
Thanks, now there are only 4 build warnings left due to this change,
I'll go fix them up in the morning...
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4.9] ipsec: check return value of skb_to_sgvec always
2018-04-09 20:25 ` Greg Kroah-Hartman
@ 2018-04-10 6:23 ` Nathan Chancellor
2018-04-10 6:25 ` Greg Kroah-Hartman
0 siblings, 1 reply; 8+ messages in thread
From: Nathan Chancellor @ 2018-04-10 6:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: stable, Jason A. Donenfeld, Steffen Klassert, Herbert Xu,
David S. Miller
On Mon, Apr 09, 2018 at 10:25:30PM +0200, Greg Kroah-Hartman wrote:
> On Mon, Apr 09, 2018 at 11:05:25AM -0700, Nathan Chancellor wrote:
> > From: "Jason A. Donenfeld" <Jason@zx2c4.com>
> >
> > commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
> >
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > Cc: Steffen Klassert <steffen.klassert@secunet.com>
> > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > Cc: "David S. Miller" <davem@davemloft.net>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > [natechancellor: Adjusted context due to lack of fca11ebde3f0]
> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> > ---
> > net/ipv4/ah4.c | 8 ++++++--
> > net/ipv4/esp4.c | 13 ++++++++-----
> > net/ipv6/ah6.c | 8 ++++++--
> > net/ipv6/esp6.c | 12 ++++++++----
> > 4 files changed, 28 insertions(+), 13 deletions(-)
>
> Thanks, now there are only 4 build warnings left due to this change,
> I'll go fix them up in the morning...
>
> greg k-h
Sorry, I should have checked the other call sites of skb_to_sgvec* :/
These are the other two commits, I've sent the backports out in a
separate email thread:
89a5ea996625 ("rxrpc: check return value of skb_to_sgvec always")
e2fcad58fd23 ("virtio_net: check return value of skb_to_sgvec always")
Cheers!
Nathan
(sorry, meant to send this several hours ago then got distracted...)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 4.9] ipsec: check return value of skb_to_sgvec always
2018-04-10 6:23 ` Nathan Chancellor
@ 2018-04-10 6:25 ` Greg Kroah-Hartman
0 siblings, 0 replies; 8+ messages in thread
From: Greg Kroah-Hartman @ 2018-04-10 6:25 UTC (permalink / raw)
To: Nathan Chancellor
Cc: stable, Jason A. Donenfeld, Steffen Klassert, Herbert Xu,
David S. Miller
On Mon, Apr 09, 2018 at 11:23:17PM -0700, Nathan Chancellor wrote:
> On Mon, Apr 09, 2018 at 10:25:30PM +0200, Greg Kroah-Hartman wrote:
> > On Mon, Apr 09, 2018 at 11:05:25AM -0700, Nathan Chancellor wrote:
> > > From: "Jason A. Donenfeld" <Jason@zx2c4.com>
> > >
> > > commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.
> > >
> > > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > > Cc: Steffen Klassert <steffen.klassert@secunet.com>
> > > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > > Cc: "David S. Miller" <davem@davemloft.net>
> > > Signed-off-by: David S. Miller <davem@davemloft.net>
> > > [natechancellor: Adjusted context due to lack of fca11ebde3f0]
> > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> > > ---
> > > net/ipv4/ah4.c | 8 ++++++--
> > > net/ipv4/esp4.c | 13 ++++++++-----
> > > net/ipv6/ah6.c | 8 ++++++--
> > > net/ipv6/esp6.c | 12 ++++++++----
> > > 4 files changed, 28 insertions(+), 13 deletions(-)
> >
> > Thanks, now there are only 4 build warnings left due to this change,
> > I'll go fix them up in the morning...
> >
> > greg k-h
>
> Sorry, I should have checked the other call sites of skb_to_sgvec* :/
>
> These are the other two commits, I've sent the backports out in a
> separate email thread:
>
> 89a5ea996625 ("rxrpc: check return value of skb_to_sgvec always")
> e2fcad58fd23 ("virtio_net: check return value of skb_to_sgvec always")
>
> Cheers!
> Nathan
>
> (sorry, meant to send this several hours ago then got distracted...)
No worries, I see the patches now, will queue them up in a bit.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Backport of 3f29770723fe
2018-04-09 18:05 Backport of 3f29770723fe Nathan Chancellor
` (2 preceding siblings ...)
2018-04-09 18:05 ` [PATCH 4.9] " Nathan Chancellor
@ 2018-04-10 12:53 ` Greg Kroah-Hartman
3 siblings, 0 replies; 8+ messages in thread
From: Greg Kroah-Hartman @ 2018-04-10 12:53 UTC (permalink / raw)
To: Nathan Chancellor; +Cc: stable
On Mon, Apr 09, 2018 at 11:05:22AM -0700, Nathan Chancellor wrote:
> Hi Greg,
>
> Here is the backport of 3f29770723fe ("ipsec: check return value of
> skb_to_sgvec always") for the 3.18, 4.4, and 4.9 trees, fixing the
> warnings generated by 48a1df65334b ("skbuff: return -EMSGSIZE in
> skb_to_sgvec to prevent overflow").
>
> Let me know if there are any issues! First time using git send-email...a
It worked fine, thanks, all now applied.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread