Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfrm: respect ip protocols rules criteria when performing dst lookups

Browse Source 
The series in the "fixes" tag added the ability to consider L4 attributes
in routing rules.

The dst lookup on the outer packet of encapsulated traffic in the xfrm
code was not adapted to this change, thus routing behavior that relies
on L4 information is not respected.

Pass the ip protocol information when performing dst lookups.

Fixes: a25724b05a ("Merge branch 'fib_rules-support-sport-dport-and-proto-match'")
Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Tested-by: Antony Antony <antony.antony@secunet.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Eyal Birger 2024-09-02 17:07:10 -07:00 committed by Steffen Klassert
parent e509996b16
commit b846972103
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/xfrm.h
View File

@ -356,6 +356,8 @@ struct xfrm_dst_lookup_params {
xfrm_address_t *saddr; xfrm_address_t *saddr;
xfrm_address_t *daddr; xfrm_address_t *daddr;
u32 mark; u32 mark;
__u8 ipproto;
union flowi_uli uli;
}; };
struct net_device; struct net_device;

2
net/ipv4/xfrm4_policy.c
View File

@ -30,6 +30,8 @@ static struct dst_entry *__xfrm4_dst_lookup(struct flowi4 *fl4,
fl4->flowi4_mark = params->mark; fl4->flowi4_mark = params->mark;
if (params->saddr) if (params->saddr)
fl4->saddr = params->saddr->a4; fl4->saddr = params->saddr->a4;
fl4->flowi4_proto = params->ipproto;
fl4->uli = params->uli;
rt = __ip_route_output_key(params->net, fl4); rt = __ip_route_output_key(params->net, fl4);
if (!IS_ERR(rt)) if (!IS_ERR(rt))

3
net/ipv6/xfrm6_policy.c
View File

@ -37,6 +37,9 @@ static struct dst_entry *xfrm6_dst_lookup(const struct xfrm_dst_lookup_params *p
if (params->saddr) if (params->saddr)
memcpy(&fl6.saddr, params->saddr, sizeof(fl6.saddr)); memcpy(&fl6.saddr, params->saddr, sizeof(fl6.saddr));
fl6.flowi4_proto = params->ipproto;
fl6.uli = params->uli;
dst = ip6_route_output(params->net, NULL, &fl6); dst = ip6_route_output(params->net, NULL, &fl6);
err = dst->error; err = dst->error;

15
net/xfrm/xfrm_policy.c
View File

@ -315,6 +315,21 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x,
params.tos = tos; params.tos = tos;
params.oif = oif; params.oif = oif;
params.mark = mark; params.mark = mark;
params.ipproto = x->id.proto;
if (x->encap) {
switch (x->encap->encap_type) {
case UDP_ENCAP_ESPINUDP:
params.ipproto = IPPROTO_UDP;
params.uli.ports.sport = x->encap->encap_sport;
params.uli.ports.dport = x->encap->encap_dport;
break;
case TCP_ENCAP_ESPINTCP:
params.ipproto = IPPROTO_TCP;
params.uli.ports.sport = x->encap->encap_sport;
params.uli.ports.dport = x->encap->encap_dport;
break;
}
}
dst = __xfrm_dst_lookup(family, &params); dst = __xfrm_dst_lookup(family, &params);