Commit 6851161f authored by Steffen Klassert's avatar Steffen Klassert
Browse files

Revert "esp: fix page frag reference leak on skb_to_sgvec failure" 



This reverts commit 2982e599.

The patch does not fully fix the issue and the Author does
not match the 'Signed-off-by:' tag, so revert it for now.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent c16f74dc

net/ipv4/esp4.c

+5 −7
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, 
			     __alignof__(struct scatterlist));

}



static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, bool already_unref)

static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)

{

	struct crypto_aead *aead = x->data;

	int extralen = 0;
@@ -113,7 +113,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, 
	/* Unref skb_frag_pages in the src scatterlist if necessary.

	 * Skip the first sg which comes from skb->data.

	 */

	if (already_unref || req->src != req->dst)

	if (req->src != req->dst)

		for (sg = sg_next(req->src); sg; sg = sg_next(sg))

			skb_page_unref(page_to_netmem(sg_page(sg)),

				       skb->pp_recycle);
@@ -220,7 +220,7 @@ static void esp_output_done(void *data, int err) 
	}



	tmp = ESP_SKB_CB(skb)->tmp;

	esp_ssg_unref(x, tmp, skb, false);

	esp_ssg_unref(x, tmp, skb);

	kfree(tmp);



	if (xo && (xo->flags & XFRM_DEV_RESUME)) {
@@ -569,11 +569,9 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * 
		err = skb_to_sgvec(skb, dsg,

			           (unsigned char *)esph - skb->data,

			           assoclen + ivlen + esp->clen + alen);

		if (unlikely(err < 0)) {

			esp_ssg_unref(x, tmp, skb, true);

		if (unlikely(err < 0))

			goto error_free;

	}

	}



	if ((x->props.flags & XFRM_STATE_ESN))

		aead_request_set_callback(req, 0, esp_output_done_esn, skb);
@@ -604,7 +602,7 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * 
	}



	if (sg != dsg)

		esp_ssg_unref(x, tmp, skb, false);

		esp_ssg_unref(x, tmp, skb);



	if (!err && x->encap && x->encap->encap_type == TCP_ENCAP_ESPINTCP)

		err = esp_output_tail_tcp(x, skb);

net/ipv6/esp6.c

+5 −7
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, 
			     __alignof__(struct scatterlist));

}



static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, bool already_unref)

static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)

{

	struct crypto_aead *aead = x->data;

	int extralen = 0;
@@ -130,7 +130,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, 
	/* Unref skb_frag_pages in the src scatterlist if necessary.

	 * Skip the first sg which comes from skb->data.

	 */

	if (already_unref || req->src != req->dst)

	if (req->src != req->dst)

		for (sg = sg_next(req->src); sg; sg = sg_next(sg))

			skb_page_unref(page_to_netmem(sg_page(sg)),

				       skb->pp_recycle);
@@ -254,7 +254,7 @@ static void esp_output_done(void *data, int err) 
	}



	tmp = ESP_SKB_CB(skb)->tmp;

	esp_ssg_unref(x, tmp, skb, false);

	esp_ssg_unref(x, tmp, skb);

	kfree(tmp);



	esp_output_encap_csum(skb);
@@ -600,11 +600,9 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info 
		err = skb_to_sgvec(skb, dsg,

			           (unsigned char *)esph - skb->data,

			           assoclen + ivlen + esp->clen + alen);

		if (unlikely(err < 0)) {

			esp_ssg_unref(x, tmp, skb, true);

		if (unlikely(err < 0))

			goto error_free;

	}

	}



	if ((x->props.flags & XFRM_STATE_ESN))

		aead_request_set_callback(req, 0, esp_output_done_esn, skb);
@@ -636,7 +634,7 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info 
	}



	if (sg != dsg)

		esp_ssg_unref(x, tmp, skb, false);

		esp_ssg_unref(x, tmp, skb);



	if (!err && x->encap && x->encap->encap_type == TCP_ENCAP_ESPINTCP)

		err = esp_output_tail_tcp(x, skb);