|
 |
f1d1c0 |
From ca4d1604b18abf7189ecfd5e06cb74abc3694076 Mon Sep 17 00:00:00 2001
|
|
|
f1d1c0 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
f1d1c0 |
Date: Thu, 16 Jan 2020 18:40:52 +0100
|
|
|
f1d1c0 |
Subject: [PATCH] xfrm: spi is big-endian
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1790963
|
|
|
f1d1c0 |
Upstream Status: nftables commit 488356b895024
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
commit 488356b895024d0944b20feb1f930558726e0877
|
|
|
f1d1c0 |
Author: Florian Westphal <fw@strlen.de>
|
|
|
f1d1c0 |
Date: Tue Jan 14 13:37:28 2020 +0100
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
xfrm: spi is big-endian
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
the kernel stores spi in a __be32, so fix up the byteorder annotation.
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
f1d1c0 |
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
f1d1c0 |
---
|
|
|
f1d1c0 |
src/xfrm.c | 2 +-
|
|
|
f1d1c0 |
tests/py/inet/ipsec.t.payload | 1 -
|
|
|
f1d1c0 |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
diff --git a/src/xfrm.c b/src/xfrm.c
|
|
|
f1d1c0 |
index 4dd53c3..336e8c9 100644
|
|
|
f1d1c0 |
--- a/src/xfrm.c
|
|
|
f1d1c0 |
+++ b/src/xfrm.c
|
|
|
f1d1c0 |
@@ -39,7 +39,7 @@ const struct xfrm_template xfrm_templates[] = {
|
|
|
f1d1c0 |
[NFT_XFRM_KEY_DADDR_IP6] = XFRM_TEMPLATE_BE("daddr", &ip6addr_type, 16 * BITS_PER_BYTE),
|
|
|
f1d1c0 |
[NFT_XFRM_KEY_SADDR_IP6] = XFRM_TEMPLATE_BE("saddr", &ip6addr_type, 16 * BITS_PER_BYTE),
|
|
|
f1d1c0 |
[NFT_XFRM_KEY_REQID] = XFRM_TEMPLATE_HE("reqid", &integer_type, 4 * BITS_PER_BYTE),
|
|
|
f1d1c0 |
- [NFT_XFRM_KEY_SPI] = XFRM_TEMPLATE_HE("spi", &integer_type, 4 * BITS_PER_BYTE),
|
|
|
f1d1c0 |
+ [NFT_XFRM_KEY_SPI] = XFRM_TEMPLATE_BE("spi", &integer_type, 4 * BITS_PER_BYTE),
|
|
|
f1d1c0 |
};
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
static void xfrm_expr_print(const struct expr *expr, struct output_ctx *octx)
|
|
|
f1d1c0 |
diff --git a/tests/py/inet/ipsec.t.payload b/tests/py/inet/ipsec.t.payload
|
|
|
f1d1c0 |
index 6049c66..c46a226 100644
|
|
|
f1d1c0 |
--- a/tests/py/inet/ipsec.t.payload
|
|
|
f1d1c0 |
+++ b/tests/py/inet/ipsec.t.payload
|
|
|
f1d1c0 |
@@ -16,7 +16,6 @@ ip ipsec-ip4 ipsec-input
|
|
|
f1d1c0 |
# ipsec out spi 1-561
|
|
|
f1d1c0 |
inet ipsec-inet ipsec-post
|
|
|
f1d1c0 |
[ xfrm load out 0 spi => reg 1 ]
|
|
|
f1d1c0 |
- [ byteorder reg 1 = hton(reg 1, 4, 4) ]
|
|
|
f1d1c0 |
[ cmp gte reg 1 0x01000000 ]
|
|
|
f1d1c0 |
[ cmp lte reg 1 0x31020000 ]
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
--
|
|
|
bfbb76 |
2.31.1
|
|
|
f1d1c0 |
|