Skip to content

Commit

Permalink
[IPSEC]: Do xfrm_state_check_space before encapsulation
Browse files Browse the repository at this point in the history
While merging the IPsec output path I moved the encapsulation output
operation to the top of the loop so that it sits outside of the locked
section.  Unfortunately in doing so it now sits in front of the space
check as well which could be a fatal error.

This patch rearranges the calls so that the space check happens as
the thing on the output path.

This patch also fixes an incorrect goto should the encapsulation output
fail.

Thanks to Kazunori MIYAZAWA for finding this bug.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jan 28, 2008
1 parent 33b8e77 commit 910ef70
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions net/xfrm/xfrm_output.c
Original file line number Diff line number Diff line change
@@ -33,16 +33,6 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
return 0;
}

static int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)
{
int err = xfrm_state_check_expire(x);
if (err < 0)
goto err;
err = xfrm_state_check_space(x, skb);
err:
return err;
}

static int xfrm_output_one(struct sk_buff *skb, int err)
{
struct dst_entry *dst = skb->dst;
@@ -52,12 +42,16 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
goto resume;

do {
err = xfrm_state_check_space(x, skb);
if (err)
goto error_nolock;

err = x->outer_mode->output(x, skb);
if (err)
goto error;
goto error_nolock;

spin_lock_bh(&x->lock);
err = xfrm_state_check(x, skb);
err = xfrm_state_check_expire(x);
if (err)
goto error;

0 comments on commit 910ef70

Please sign in to comment.