xfrm: Allow different selector family in temporary state
Subsystems (3)
Steffen Klassert
maintainerPATCH 1/1 xfrm: Allow different selector family in temporary state
From: Thomas Egerer <[email protected]>
The family parameter xfrm_state_find is used to find a state matching a certain policy. This value is set to the template's family (encap_family) right before xfrm_state_find is called.
The family parameter is however also used to construct a temporary state in xfrm_state_find itself which is wrong for inter-family scenarios because it produces a selector for the wrong family. Since this selector is included in the xfrm_user_acquire structure, user space programs misinterpret IPv6 addresses as IPv4 and vice versa.
This patch splits up the original init_tempsel function into a part that initializes the selector respectively the props and id of the temporary state, to allow for differing ip address families whithin the state.
--- include/net/xfrm.h | 4 ++-- net/ipv4/xfrm4_state.c | 33 +++++++++++++++++++-------------- net/ipv6/xfrm6_state.c | 33 +++++++++++++++++++-------------- net/xfrm/xfrm_policy.c | 5 ++--- net/xfrm/xfrm_state.c | 45 +++++++++++++++++++++++++++------------------ 5 files changed, 69 insertions(+), 51 deletions(-)
include/net/xfrm.h +2 -2
@@ -298,8 +298,8 @@ struct xfrm_state_afinfo {const struct xfrm_type *type_map[IPPROTO_MAX ];struct xfrm_mode *mode_map[XFRM_MODE_MAX ];int (*init_flags)(struct xfrm_state *x); -void (*init_tempsel)(struct xfrm_state *x,struct flowi *fl, -struct xfrm_tmpl *tmpl, +void (*init_tempsel)(struct xfrm_selector *sel,struct flowi *fl); +void (*init_temprop)(struct xfrm_state *x,struct xfrm_tmpl *tmpl,xfrm_address_t *daddr,xfrm_address_t *saddr);int (*tmpl_sort)(struct xfrm_tmpl **dst,struct xfrm_tmpl **src,int n);int (*state_sort)(struct xfrm_state **dst,struct xfrm_state **src,int n);
net/ipv4/xfrm4_state.c +19 -14
@@ -21,21 +21,25 @@ static int xfrm4_init_flags(struct xfrm_state *x) }static void -__xfrm4_init_tempsel (struct xfrm_state *x,struct flowi *fl, -struct xfrm_tmpl *tmpl, -xfrm_address_t *daddr,xfrm_address_t *saddr) +__xfrm4_init_tempsel (struct xfrm_selector *sel,struct flowi *fl) +{ + sel->daddr.a4 = fl->fl4_dst; + sel->saddr.a4 = fl->fl4_src; + sel->dport =xfrm_flowi_dport (fl); + sel->dport_mask =htons (0xffff ); + sel->sport =xfrm_flowi_sport (fl); + sel->sport_mask =htons (0xffff ); + sel->family =AF_INET ; + sel->prefixlen_d =32 ; + sel->prefixlen_s =32 ; + sel->proto = fl->proto; + sel->ifindex = fl->oif; +} + +static void +xfrm4_init_temprop (struct xfrm_state *x,struct xfrm_tmpl *tmpl, +xfrm_address_t *daddr,xfrm_address_t *saddr) { - x->sel.daddr.a4 = fl->fl4_dst; - x->sel.saddr.a4 = fl->fl4_src; - x->sel.dport =xfrm_flowi_dport (fl); - x->sel.dport_mask =htons (0xffff ); - x->sel.sport =xfrm_flowi_sport (fl); - x->sel.sport_mask =htons (0xffff ); - x->sel.family =AF_INET ; - x->sel.prefixlen_d =32 ; - x->sel.prefixlen_s =32 ; - x->sel.proto = fl->proto; - x->sel.ifindex = fl->oif; x->id = tmpl->id;if (x->id.daddr.a4 ==0 ) x->id.daddr.a4 = daddr->a4;
@@ -70,6 +74,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .owner = THIS_MODULE, .init_flags = xfrm4_init_flags, .init_tempsel = __xfrm4_init_tempsel, + .init_temprop = xfrm4_init_temprop, .output = xfrm4_output, .extract_input = xfrm4_extract_input, .extract_output = xfrm4_extract_output,
net/ipv6/xfrm6_state.c +19 -14
@@ -20,23 +20,27 @@#include <net/addrconf.h> static void -__xfrm6_init_tempsel (struct xfrm_state *x,struct flowi *fl, -struct xfrm_tmpl *tmpl, -xfrm_address_t *daddr,xfrm_address_t *saddr) +__xfrm6_init_tempsel (struct xfrm_selector *sel,struct flowi *fl) {/* Initialize temporary selector matching only * to current session. */ -ipv6_addr_copy ((struct in6_addr *)&x->sel.daddr, &fl->fl6_dst); -ipv6_addr_copy ((struct in6_addr *)&x->sel.saddr, &fl->fl6_src); - x->sel.dport =xfrm_flowi_dport (fl); - x->sel.dport_mask =htons (0xffff ); - x->sel.sport =xfrm_flowi_sport (fl); - x->sel.sport_mask =htons (0xffff ); - x->sel.family =AF_INET6 ; - x->sel.prefixlen_d =128 ; - x->sel.prefixlen_s =128 ; - x->sel.proto = fl->proto; - x->sel.ifindex = fl->oif; +ipv6_addr_copy ((struct in6_addr *)&sel->daddr, &fl->fl6_dst); +ipv6_addr_copy ((struct in6_addr *)&sel->saddr, &fl->fl6_src); + sel->dport =xfrm_flowi_dport (fl); + sel->dport_mask =htons (0xffff ); + sel->sport =xfrm_flowi_sport (fl); + sel->sport_mask =htons (0xffff ); + sel->family =AF_INET6 ; + sel->prefixlen_d =128 ; + sel->prefixlen_s =128 ; + sel->proto = fl->proto; + sel->ifindex = fl->oif; +} + +static void +xfrm6_init_temprop (struct xfrm_state *x,struct xfrm_tmpl *tmpl, +xfrm_address_t *daddr,xfrm_address_t *saddr) +{ x->id = tmpl->id;if (ipv6_addr_any ((struct in6_addr *)&x->id.daddr))memcpy (&x->id.daddr, daddr,sizeof (x->sel.daddr));
@@ -168,6 +172,7 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = { .eth_proto = htons(ETH_P_IPV6), .owner = THIS_MODULE, .init_tempsel = __xfrm6_init_tempsel, + .init_temprop = xfrm6_init_temprop, .tmpl_sort = __xfrm6_tmpl_sort, .state_sort = __xfrm6_state_sort, .output = xfrm6_output,
net/xfrm/xfrm_policy.c +2 -3
@@ -1175,9 +1175,8 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl, tmpl->mode == XFRM_MODE_BEET) { remote = &tmpl->id.daddr; local = &tmpl->saddr; - family = tmpl->encap_family; -if (xfrm_addr_any (local, family)) { - error =xfrm_get_saddr (net, &tmp, remote, family); +if (xfrm_addr_any (local, tmpl->encap_family)) { + error =xfrm_get_saddr (net, &tmp, remote, tmpl->encap_family);if (error) goto fail; local = &tmp;
net/xfrm/xfrm_state.c +27 -18
105 lines not on this page · raw message
Signature · 1 line
1.7.0.4
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Mon, 20 Sep 2010 13:52:53 +0200
Quoted 14 lines
From: Thomas Egerer <[email protected]>
The family parameter
xfrm_state_findis used to find a state matching a certain policy. This value is set to the template's family (encap_family) right beforexfrm_state_findis called.
The family parameter is however also used to construct a temporary state inxfrm_state_finditself which is wrong for inter-family scenarios because it produces a selector for the wrong family. Since this selector is included in thexfrm_user_acquirestructure, user space programs misinterpret IPv6 addresses as IPv4 and vice versa.
This patch splits up the originalinit_tempselfunction into a part that initializes the selector respectively the props and id of the temporary state, to allow for differing ip address families whithin the state.
Quoted 2 lines
Signed-off-by Thomas Egerer <[email protected]>Signed-off-by Steffen Klassert <[email protected]>
Looks good, applied, thanks a lot.