Attachment 303276 Details for Bug 442820 – [IPSEC]: Fix catch-22 with algorithm IDs above 31

[patch] [IPSEC]: Fix catch-22 with algorithm IDs above 31

p (text/plain), 1.90 KB, created by Herbert Xu on 2008-04-22 07:44:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-04-22 07:44:31 UTC

Size: 1.90 KB

patch

obsolete

>diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
>diff --git a/include/net/xfrm.h b/include/net/xfrm.h
>index b56b6a1..baa9f37 100644
>--- a/include/net/xfrm.h
>+++ b/include/net/xfrm.h
>@@ -436,6 +436,9 @@ struct xfrm_tmpl
> /* May skip this transfomration if no SA is found */
> 	__u8			optional;
> 
>+/* Skip aalgos/ealgos/calgos checks. */
>+	__u8			allalgs;
>+
> /* Bit mask of algos allowed for acquisition */
> 	__u32			aalgos;
> 	__u32			ealgos;
>diff --git a/net/key/af_key.c b/net/key/af_key.c
>index 1fb0fe4..81a8e52 100644
>--- a/net/key/af_key.c
>+++ b/net/key/af_key.c
>@@ -1907,7 +1907,7 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
> 		t->encap_family = xp->family;
> 
> 	/* No way to set this via kame pfkey */
>-	t->aalgos = t->ealgos = t->calgos = ~0;
>+	t->allalgs = 1;
> 	xp->xfrm_nr++;
> 	return 0;
> }
>diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
>index ab4d0e5..e0c0390 100644
>--- a/net/xfrm/xfrm_policy.c
>+++ b/net/xfrm/xfrm_policy.c
>@@ -1819,7 +1819,7 @@ xfrm_state_ok(struct xfrm_tmpl *tmpl, struct xfrm_state *x,
> 		(x->id.spi == tmpl->id.spi || !tmpl->id.spi) &&
> 		(x->props.reqid == tmpl->reqid || !tmpl->reqid) &&
> 		x->props.mode == tmpl->mode &&
>-		((tmpl->aalgos & (1<<x->props.aalgo)) ||
>+		(tmpl->allalgs || (tmpl->aalgos & (1<<x->props.aalgo)) ||
> 		 !(xfrm_id_proto_match(tmpl->id.proto, IPSEC_PROTO_ANY))) &&
> 		!(x->props.mode != XFRM_MODE_TRANSPORT &&
> 		  xfrm_state_addr_cmp(tmpl, x, family));
>diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
>index 1810f56..22a30ae 100644
>--- a/net/xfrm/xfrm_user.c
>+++ b/net/xfrm/xfrm_user.c
>@@ -981,6 +981,8 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
> 		t->aalgos = ut->aalgos;
> 		t->ealgos = ut->ealgos;
> 		t->calgos = ut->calgos;
>+		/* If all masks are ~0, then we allow all algorithms. */
>+		t->allalgs = !~(t->aalgos & t->ealgos & t->calgos);
> 		t->encap_family = ut->family;
> 	}
> }

Actions: View | Diff

Attachments on bug 442820: 302766 | 302767 | 302787 | 302788 | 303276 | 303597