xfrm: no-anti-replay protection flag
Subsystems (3)
PATCH 1/1 xfrm: no-anti-replay protection flag
RFC 4303 in section 3.3.3 suggests to disable anti-replay for manually distributed ICVs.
This patch introduces new extra_flag XFRM_SA_XFLAG_NO_ANTI_REPLAY which disables anti-replay for outbound packets if set. The flag is used only in legacy and bmp code, because esn should not be negotiated if anti-replay is disabled (see note in 3.3.3 section).
--- include/uapi/linux/xfrm.h | 1 + net/xfrm/xfrm_replay.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/xfrm.h +1 -0
@@ -387,6 +387,7 @@ struct xfrm_usersa_info { };#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 +#define XFRM_SA_XFLAG_NO_ANTI_REPLAY 2struct xfrm_usersa_id {xfrm_address_t daddr;
net/xfrm/xfrm_replay.c +8 -4
@@ -89,7 +89,8 @@ static int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++x->replay.oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (x->replay.oseq ==0 )) { +if (unlikely (x->replay.oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) { x->replay.oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -168,7 +169,8 @@ static int xfrm_replay_overflow_bmp(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++replay_esn->oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (replay_esn->oseq ==0 )) { +if (unlikely (replay_esn->oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) { replay_esn->oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -572,7 +574,8 @@ static int xfrm_replay_overflow_offload(struct xfrm_state *x, struct sk_buff *skXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < x->replay.oseq)) { +if (unlikely (oseq < x->replay.oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -611,7 +614,8 @@ static int xfrm_replay_overflow_offload_bmp(struct xfrm_state *x, struct sk_buffXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < replay_esn->oseq)) { +if (unlikely (oseq < replay_esn->oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
Signature · 1 line
2.26.2
Hi Petr,
This patch is useful, however I think you should change the name of the option and amend its description:
the option does not disable anti-replay in output (it can only be disabled in input), it allows the output sequence number to wrap, and it assumes that the remote peer disabled anti-replay in input.
So you I suggest you change the name of the option to something like XFRM_SA_XFLAG_OSEQ_MAY_WRAP or XFRM_SA_XFLAG_ALLOW_OSEQ_WRAP.
Best regards,
Christophe
Quoted 74 lines · Petr Vaněk
RFC 4303 in section 3.3.3 suggests to disable anti-replay for manually distributed ICVs.
This patch introduces new
extra_flagXFRM_SA_XFLAG_NO_ANTI_REPLAYwhich disables anti-replay for outbound packets if set. The flag is used only in legacy and bmp code, because esn should not be negotiated if anti-replay is disabled (see note in 3.3.3 section).Signed-off-by Petr Vaněk <[email protected]>--- include/uapi/linux/xfrm.h | 1 + net/xfrm/xfrm_replay.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-)include/uapi/linux/xfrm.h +1
-0@@ -387,6 +387,7 @@ struct xfrm_usersa_info { };#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 +#define XFRM_SA_XFLAG_NO_ANTI_REPLAY 2struct xfrm_usersa_id {xfrm_address_t daddr;net/xfrm/xfrm_replay.c +8
-5@@ -89,7 +89,8 @@ static int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++x->replay.oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (x->replay.oseq ==0 )) { +if (unlikely (x->replay.oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) { x->replay.oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;@@ -168,7 +169,8 @@ static int xfrm_replay_overflow_bmp(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++replay_esn->oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (replay_esn->oseq ==0 )) { +if (unlikely (replay_esn->oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) { replay_esn->oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;@@ -572,7 +574,8 @@ static int xfrm_replay_overflow_offload(struct xfrm_state *x, struct sk_buff *skXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < x->replay.oseq)) { +if (unlikely (oseq < x->replay.oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;@@ -611,7 +614,8 @@ static int xfrm_replay_overflow_offload_bmp(struct xfrm_state *x, struct sk_buffXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < replay_esn->oseq)) { +if (unlikely (oseq < replay_esn->oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_NO_ANTI_REPLAY )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ; --2.26.2
Hi Christophe,
Quoted 8 lines · Christophe Gouault
This patch is useful, however I think you should change the name of the option and amend its description:
the option does not disable anti-replay in output (it can only be disabled in input), it allows the output sequence number to wrap, and it assumes that the remote peer disabled anti-replay in input.So you I suggest you change the name of the option to something like
XFRM_SA_XFLAG_OSEQ_MAY_WRAPorXFRM_SA_XFLAG_ALLOW_OSEQ_WRAP.
thank you for your suggestions, I changed the patch and sent the second version.
Petr
PATCH v2 1/1 xfrm: introduce oseq-may-wrap flag
In reply to Petr VaněkRFC 4303 in section 3.3.3 suggests to disable anti-replay for manually distributed ICVs in which case the sender does not need to monitor or reset the counter. However, the sender still increments the counter and when it reaches the maximum value, the counter rolls over back to zero.
This patch introduces new extra_flag XFRM_SA_XFLAG_OSEQ_MAY_WRAP which allows sequence number to cycle in outbound packets if set. This flag is used only in legacy and bmp code, because esn should not be negotiated if anti-replay is disabled (see note in 3.3.3 section).
--- include/uapi/linux/xfrm.h | 1 + net/xfrm/xfrm_replay.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/xfrm.h +1 -0
@@ -387,6 +387,7 @@ struct xfrm_usersa_info { };#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 +#define XFRM_SA_XFLAG_OSEQ_MAY_WRAP 2struct xfrm_usersa_id {xfrm_address_t daddr;
net/xfrm/xfrm_replay.c +8 -4
@@ -89,7 +89,8 @@ static int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++x->replay.oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (x->replay.oseq ==0 )) { +if (unlikely (x->replay.oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_OSEQ_MAY_WRAP )) { x->replay.oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -168,7 +169,8 @@ static int xfrm_replay_overflow_bmp(struct xfrm_state *x, struct sk_buff *skb)if (x->type->flags &XFRM_TYPE_REPLAY_PROT ) {XFRM_SKB_CB (skb)->seq.output.low = ++replay_esn->oseq;XFRM_SKB_CB (skb)->seq.output.hi =0 ; -if (unlikely (replay_esn->oseq ==0 )) { +if (unlikely (replay_esn->oseq ==0 ) && + !(x->props.extra_flags &XFRM_SA_XFLAG_OSEQ_MAY_WRAP )) { replay_esn->oseq--;xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -572,7 +574,8 @@ static int xfrm_replay_overflow_offload(struct xfrm_state *x, struct sk_buff *skXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < x->replay.oseq)) { +if (unlikely (oseq < x->replay.oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_OSEQ_MAY_WRAP )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
@@ -611,7 +614,8 @@ static int xfrm_replay_overflow_offload_bmp(struct xfrm_state *x, struct sk_buffXFRM_SKB_CB (skb)->seq.output.hi =0 ; xo->seq.hi =0 ; -if (unlikely (oseq < replay_esn->oseq)) { +if (unlikely (oseq < replay_esn->oseq) && + !(x->props.extra_flags &XFRM_SA_XFLAG_OSEQ_MAY_WRAP )) {xfrm_audit_state_replay_overflow (x, skb); err = -EOVERFLOW ;
Signature · 1 line
2.26.2
Re: [PATCH net-next v2] xfrm: introduce oseq-may-wrap flag
Quoted 11 lines · Petr Vaněk
RFC 4303 in section 3.3.3 suggests to disable anti-replay for manually distributed ICVs in which case the sender does not need to monitor or reset the counter. However, the sender still increments the counter and when it reaches the maximum value, the counter rolls over back to zero.
This patch introduces new
extra_flagXFRM_SA_XFLAG_OSEQ_MAY_WRAPwhich allows sequence number to cycle in outbound packets if set. This flag is used only in legacy and bmp code, because esn should not be negotiated if anti-replay is disabled (see note in 3.3.3 section). (...)
Hi Petr,
Thank you for taking my comment into account.
This new patch looks good to me.
Regards,
Christophe
Steffen Klassert
maintainerRe: [PATCH net-next v2] xfrm: introduce oseq-may-wrap flag
In reply to Petr VaněkQuoted 11 lines · Petr Vaněk
RFC 4303 in section 3.3.3 suggests to disable anti-replay for manually distributed ICVs in which case the sender does not need to monitor or reset the counter. However, the sender still increments the counter and when it reaches the maximum value, the counter rolls over back to zero.
This patch introduces new
extra_flagXFRM_SA_XFLAG_OSEQ_MAY_WRAPwhich allows sequence number to cycle in outbound packets if set. This flag is used only in legacy and bmp code, because esn should not be negotiated if anti-replay is disabled (see note in 3.3.3 section).Signed-off-by Petr Vaněk <[email protected]>
Now applied to ipsec-next, thanks a lot!
PATCH 1/1 ip-xfrm: add support for oseq-may-wrap extra flag
In reply to Petr VaněkThis flag allows to create SA where sequence number can cycle in outbound packets if set.
--- include/uapi/linux/xfrm.h | 1 + ip/ipxfrm.c | 3 +++ ip/xfrm_state.c | 4 +++- man/man8/ip-xfrm.8 | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-)
include/uapi/linux/xfrm.h +1 -0
@@ -387,6 +387,7 @@ struct xfrm_usersa_info { };#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 +#define XFRM_SA_XFLAG_OSEQ_MAY_WRAP 2struct xfrm_usersa_id {xfrm_address_t daddr;
ip/ipxfrm.c +3 -0
@@ -953,6 +953,9 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,XFRM_FLAG_PRINT (fp, extra_flags,XFRM_SA_XFLAG_DONT_ENCAP_DSCP ,"dont-encap-dscp" ); +XFRM_FLAG_PRINT (fp, extra_flags, +XFRM_SA_XFLAG_OSEQ_MAY_WRAP , +"oseq-may-wrap" );if (extra_flags)fprintf (fp,"%x" , extra_flags); }
ip/xfrm_state.c +3 -1
@@ -104,7 +104,7 @@ static void usage(void)"FLAG-LIST := [ FLAG-LIST ] FLAG\n" "FLAG := noecn | decap-dscp | nopmtudisc | wildrecv | icmp | af-unspec | align4 | esn\n" "EXTRA-FLAG-LIST := [ EXTRA-FLAG-LIST ] EXTRA-FLAG\n" -"EXTRA-FLAG := dont-encap-dscp\n" +"EXTRA-FLAG := dont-encap-dscp | oseq-may-wrap\n" "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV ] [ UPSPEC ]\n" "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [ dport PORT ] |\n" " { icmp | ipv6-icmp | mobility-header } [ type NUMBER ] [ code NUMBER ] |\n"
@@ -253,6 +253,8 @@ static int xfrm_state_extra_flag_parse(__u32 *extra_flags, int *argcp, char ***awhile (1 ) {if (strcmp (*argv,"dont-encap-dscp" ) ==0 ) *extra_flags |=XFRM_SA_XFLAG_DONT_ENCAP_DSCP ; +else if (strcmp (*argv,"oseq-may-wrap" ) ==0 ) + *extra_flags |=XFRM_SA_XFLAG_OSEQ_MAY_WRAP ;else {PREV_ARG ();/* back track */ break ;
man/man8/ip-xfrm.8 +1 -1
@@ -217,7 +217,7 @@ ip-xfrm \- transform configuration .ti -8 .IR EXTRA-FLAG " := " -.B dont-encap-dscp +.BR dont-encap-dscp " | " oseq-may-wrap .ti -8 .BR "ip xfrm policy" " { " add " | " update " }"
Signature · 1 line
2.26.2
David Ahern
AppliedRe: [PATCH iproute2-next] ip-xfrm: add support for oseq-may-wrap extra flag
Quoted 11 lines · Petr Vaněk
This flag allows to create SA where sequence number can cycle in outbound packets if set.
Signed-off-by Petr Vaněk <[email protected]>--- include/uapi/linux/xfrm.h | 1 + ip/ipxfrm.c | 3 +++ ip/xfrm_state.c | 4 +++- man/man8/ip-xfrm.8 | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-)
applied to iproute2-next