Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d55d3849 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

ipsec: check return value of skb_to_sgvec always 



commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.

Signed-off-by: default avatarJason 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: default avatarDavid S. Miller <davem@davemloft.net>
[natechancellor: Adjusted context due to lack of fca11ebde3f0]
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6c1f1fe

net/ipv4/ah4.c

+6 −2
Original line number Diff line number Diff line
@@ -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 */

net/ipv4/esp4.c

+8 −5
Original line number Diff line number Diff line
@@ -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,

	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);

net/ipv6/ah6.c

+6 −2
Original line number Diff line number Diff line
@@ -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 */

net/ipv6/esp6.c

+8 −4
Original line number Diff line number Diff line
@@ -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,

	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);