dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[IPSEC]: Do xfrm_state_check_space before encapsulation 

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>
This commit is contained in:
Herbert Xu 2007-12-18 22:14:25 -08:00 committed by David S. Miller
parent 33b8e77605
commit 910ef70aa3
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/xfrm/xfrm_output.c
View File

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