Skip to content

Commit

Permalink
xfrm: replay: avoid replay indirection
Browse files Browse the repository at this point in the history
Add and use xfrm_replay_check helper instead of indirection.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
  • Loading branch information
Florian Westphal authored and Steffen Klassert committed Jun 21, 2021
1 parent 25cfb8b commit adfc2fd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
4 changes: 1 addition & 3 deletions include/net/xfrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,6 @@ struct km_event {
};

struct xfrm_replay {
int (*check)(struct xfrm_state *x,
struct sk_buff *skb,
__be32 net_seq);
int (*overflow)(struct xfrm_state *x, struct sk_buff *skb);
};

Expand Down Expand Up @@ -1719,6 +1716,7 @@ static inline int xfrm_policy_id2dir(u32 index)

#ifdef CONFIG_XFRM
void xfrm_replay_advance(struct xfrm_state *x, __be32 net_seq);
int xfrm_replay_check(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);
void xfrm_replay_notify(struct xfrm_state *x, int event);
int xfrm_replay_recheck(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);

Expand Down
2 changes: 1 addition & 1 deletion net/xfrm/xfrm_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
goto drop_unlock;
}

if (x->repl->check(x, skb, seq)) {
if (xfrm_replay_check(x, skb, seq)) {
XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR);
goto drop_unlock;
}
Expand Down
27 changes: 18 additions & 9 deletions net/xfrm/xfrm_replay.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ static int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
return err;
}

static int xfrm_replay_check(struct xfrm_state *x,
struct sk_buff *skb, __be32 net_seq)
static int xfrm_replay_check_legacy(struct xfrm_state *x,
struct sk_buff *skb, __be32 net_seq)
{
u32 diff;
u32 seq = ntohl(net_seq);
Expand Down Expand Up @@ -507,6 +507,21 @@ static int xfrm_replay_check_esn(struct xfrm_state *x,
return -EINVAL;
}

int xfrm_replay_check(struct xfrm_state *x,
struct sk_buff *skb, __be32 net_seq)
{
switch (x->repl_mode) {
case XFRM_REPLAY_MODE_LEGACY:
break;
case XFRM_REPLAY_MODE_BMP:
return xfrm_replay_check_bmp(x, skb, net_seq);
case XFRM_REPLAY_MODE_ESN:
return xfrm_replay_check_esn(x, skb, net_seq);
}

return xfrm_replay_check_legacy(x, skb, net_seq);
}

static int xfrm_replay_recheck_esn(struct xfrm_state *x,
struct sk_buff *skb, __be32 net_seq)
{
Expand All @@ -532,7 +547,7 @@ int xfrm_replay_recheck(struct xfrm_state *x,
return xfrm_replay_recheck_esn(x, skb, net_seq);
}

return xfrm_replay_check(x, skb, net_seq);
return xfrm_replay_check_legacy(x, skb, net_seq);
}

static void xfrm_replay_advance_esn(struct xfrm_state *x, __be32 net_seq)
Expand Down Expand Up @@ -723,32 +738,26 @@ static int xfrm_replay_overflow_offload_esn(struct xfrm_state *x, struct sk_buff
}

static const struct xfrm_replay xfrm_replay_legacy = {
.check = xfrm_replay_check,
.overflow = xfrm_replay_overflow_offload,
};

static const struct xfrm_replay xfrm_replay_bmp = {
.check = xfrm_replay_check_bmp,
.overflow = xfrm_replay_overflow_offload_bmp,
};

static const struct xfrm_replay xfrm_replay_esn = {
.check = xfrm_replay_check_esn,
.overflow = xfrm_replay_overflow_offload_esn,
};
#else
static const struct xfrm_replay xfrm_replay_legacy = {
.check = xfrm_replay_check,
.overflow = xfrm_replay_overflow,
};

static const struct xfrm_replay xfrm_replay_bmp = {
.check = xfrm_replay_check_bmp,
.overflow = xfrm_replay_overflow_bmp,
};

static const struct xfrm_replay xfrm_replay_esn = {
.check = xfrm_replay_check_esn,
.overflow = xfrm_replay_overflow_esn,
};
#endif
Expand Down

0 comments on commit adfc2fd

Please sign in to comment.