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

Commit 4ff0308f authored by Steffen Klassert's avatar Steffen Klassert
Browse files

esp: Fix error handling on layer 2 xmit. 



esp_output_tail() and esp6_output_tail() can return negative
and positive error values. We currently treat only negative
values as errors, fix this to treat both cases as error.

Fixes: fca11ebd ("esp4: Reorganize esp_output")
Fixes: 383d0350 ("esp6: Reorganize esp_output")
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 7bab0963

net/ipv4/esp4_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ 
	esp.seqno = cpu_to_be64(xo->seq.low + ((u64)xo->seq.hi << 32));



	err = esp_output_tail(x, skb, &esp);

	if (err < 0)

	if (err)

		return err;



	secpath_reset(skb);

net/ipv6/esp6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features 
	esp.seqno = cpu_to_be64(xo->seq.low + ((u64)xo->seq.hi << 32));



	err = esp6_output_tail(x, skb, &esp);

	if (err < 0)

	if (err)

		return err;



	secpath_reset(skb);