When using GSO it can happen that the wrong seq_hi is used for the last
packets before the wrap around. This can lead to double usage of a
sequence number. To avoid this, we should serialize this last GSO
packet.
Fixes: d7dbefc45cf5 ("xfrm: Add xfrm_replay_overflow functions for...")
Signed-off-by: Christian Langrock <[email protected]>
Reviewed-by: Leon Romanovsky <[email protected]>
---
Changes in v4:
- move changelog within comment
- add reviewer
Changes in v3:
- fix build
- remove wrapper function
Changes in v2:
- switch to bool as return value
- remove switch case in wrapper function
---
include/net/xfrm.h | 1 +
net/xfrm/xfrm_output.c | 2 +-
net/xfrm/xfrm_replay.c | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6e8fa98f786f..b845f911767c 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1749,6 +1749,7 @@ 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_overflow(struct xfrm_state *x, struct sk_buff *skb);
+bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb);
int xfrm_replay_recheck(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);
static inline int xfrm_aevent_is_on(struct net *net)
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 9a5e79a38c67..c470a68d9c88 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -738,7 +738,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
skb->encapsulation = 1;
if (skb_is_gso(skb)) {
- if (skb->inner_protocol)
+ if (skb->inner_protocol || xfrm_replay_overflow_check(x, skb))
return xfrm_output_gso(net, sk, skb);
skb_shinfo(skb)->gso_type |= SKB_GSO_ESP;
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index 9277d81b344c..23858eb5eab4 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -750,6 +750,27 @@ int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
return xfrm_replay_overflow_offload(x, skb);
}
+
+static bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
+{
+ struct xfrm_replay_state_esn *replay_esn = x->replay_esn;
+ __u32 oseq = replay_esn->oseq;
+
+ /* We assume that this function is called with
+ * skb_is_gso(skb) == true
+ */
+
+ if (x->repl_mode == XFRM_REPLAY_MODE_ESN) {
+ if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
+ oseq = oseq + 1 + skb_shinfo(skb)->gso_segs;
+ if (unlikely(oseq < replay_esn->oseq))
+ return true;
+ }
+ }
+
+ return false;
+}
+
#else
int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
{
@@ -764,6 +785,11 @@ int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
return __xfrm_replay_overflow(x, skb);
}
+
+bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
+{
+ return false;
+}
#endif
int xfrm_init_replay(struct xfrm_state *x)
--
2.37.1.223.g6a475b71f8
On Thu, Sep 29, 2022 at 01:52:07PM +0200, Christian Langrock wrote:
> When using GSO it can happen that the wrong seq_hi is used for the last
> packets before the wrap around. This can lead to double usage of a
> sequence number. To avoid this, we should serialize this last GSO
> packet.
>
> Fixes: d7dbefc45cf5 ("xfrm: Add xfrm_replay_overflow functions for...")
Sorry that I missed it in previous reviews, but please never truncate
fixes line.
> Signed-off-by: Christian Langrock <[email protected]>
> Reviewed-by: Leon Romanovsky <[email protected]>
> ---
> Changes in v4:
> - move changelog within comment
> - add reviewer
>
> Changes in v3:
> - fix build
> - remove wrapper function
>
> Changes in v2:
> - switch to bool as return value
> - remove switch case in wrapper function
> ---
> include/net/xfrm.h | 1 +
> net/xfrm/xfrm_output.c | 2 +-
> net/xfrm/xfrm_replay.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/include/net/xfrm.h b/include/net/xfrm.h
> index 6e8fa98f786f..b845f911767c 100644
> --- a/include/net/xfrm.h
> +++ b/include/net/xfrm.h
> @@ -1749,6 +1749,7 @@ 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_overflow(struct xfrm_state *x, struct sk_buff *skb);
> +bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb);
> int xfrm_replay_recheck(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq);
>
> static inline int xfrm_aevent_is_on(struct net *net)
> diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
> index 9a5e79a38c67..c470a68d9c88 100644
> --- a/net/xfrm/xfrm_output.c
> +++ b/net/xfrm/xfrm_output.c
> @@ -738,7 +738,7 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
> skb->encapsulation = 1;
>
> if (skb_is_gso(skb)) {
> - if (skb->inner_protocol)
> + if (skb->inner_protocol || xfrm_replay_overflow_check(x, skb))
> return xfrm_output_gso(net, sk, skb);
>
> skb_shinfo(skb)->gso_type |= SKB_GSO_ESP;
> diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
> index 9277d81b344c..23858eb5eab4 100644
> --- a/net/xfrm/xfrm_replay.c
> +++ b/net/xfrm/xfrm_replay.c
> @@ -750,6 +750,27 @@ int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
>
> return xfrm_replay_overflow_offload(x, skb);
> }
> +
> +static bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
> +{
> + struct xfrm_replay_state_esn *replay_esn = x->replay_esn;
> + __u32 oseq = replay_esn->oseq;
> +
> + /* We assume that this function is called with
> + * skb_is_gso(skb) == true
> + */
> +
> + if (x->repl_mode == XFRM_REPLAY_MODE_ESN) {
> + if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
> + oseq = oseq + 1 + skb_shinfo(skb)->gso_segs;
> + if (unlikely(oseq < replay_esn->oseq))
> + return true;
> + }
> + }
> +
> + return false;
> +}
> +
> #else
> int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
> {
> @@ -764,6 +785,11 @@ int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
>
> return __xfrm_replay_overflow(x, skb);
> }
> +
> +bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
> +{
> + return false;
> +}
> #endif
>
> int xfrm_init_replay(struct xfrm_state *x)
> --
> 2.37.1.223.g6a475b71f8
>
>
Hi Christian,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on klassert-ipsec/master]
[also build test ERROR on net-next/master net/master linus/master v6.0-rc7 next-20220929]
[cannot apply to klassert-ipsec-next/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-Langrock/xfrm-replay-Fix-ESN-wrap-around-for-GSO/20220929-195233
base: https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
config: x86_64-rhel-8.3-func
compiler: gcc-11 (Debian 11.3.0-5) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/48e26cc03f8bd9712712a13b50c4fbed615beaf2
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Christian-Langrock/xfrm-replay-Fix-ESN-wrap-around-for-GSO/20220929-195233
git checkout 48e26cc03f8bd9712712a13b50c4fbed615beaf2
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/iommu/ fs/ net/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
>> net/xfrm/xfrm_replay.c:754:13: error: static declaration of 'xfrm_replay_overflow_check' follows non-static declaration
754 | static bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from net/xfrm/xfrm_replay.c:10:
include/net/xfrm.h:1752:6: note: previous declaration of 'xfrm_replay_overflow_check' with type 'bool(struct xfrm_state *, struct sk_buff *)' {aka '_Bool(struct xfrm_state *, struct sk_buff *)'}
1752 | bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
net/xfrm/xfrm_replay.c:754:13: warning: 'xfrm_replay_overflow_check' defined but not used [-Wunused-function]
754 | static bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/xfrm_replay_overflow_check +754 net/xfrm/xfrm_replay.c
753
> 754 static bool xfrm_replay_overflow_check(struct xfrm_state *x, struct sk_buff *skb)
755 {
756 struct xfrm_replay_state_esn *replay_esn = x->replay_esn;
757 __u32 oseq = replay_esn->oseq;
758
759 /* We assume that this function is called with
760 * skb_is_gso(skb) == true
761 */
762
763 if (x->repl_mode == XFRM_REPLAY_MODE_ESN) {
764 if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
765 oseq = oseq + 1 + skb_shinfo(skb)->gso_segs;
766 if (unlikely(oseq < replay_esn->oseq))
767 return true;
768 }
769 }
770
771 return false;
772 }
773
--
0-DAY CI Kernel Test Service
https://01.org/lkp