diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-07-01 05:32:48 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2023-07-01 05:43:49 -0700 |
| commit | 4e9c50ef96434ad41dbcf83556d962da123fdcbf (patch) | |
| tree | 6f2de8cd4dd8de89d4f121cefc447a160d35cf02 | |
| parent | ecd24db4dc417903cf7c8707eeb6617c9e357faa (diff) | |
| download | tests-4e9c50ef96434ad41dbcf83556d962da123fdcbf.tar.gz | |
net-test: populate correct procotol in ESP trailer
avoids triggering a Linux 6.4+ kernel WARN_ON
See also discussion at
https://patchwork.kernel.org/project/netdevbpf/patch/20230630153759.3349299-1-maze@google.com/
Test: TreeHugger, on UML
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia3db363849ed7073284256cee1d95035cf5c5d92
| -rwxr-xr-x | net/test/xfrm_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/xfrm_test.py b/net/test/xfrm_test.py index 2289d4d..9eadc38 100755 --- a/net/test/xfrm_test.py +++ b/net/test/xfrm_test.py @@ -454,7 +454,7 @@ class XfrmFunctionalTest(xfrm_base.XfrmLazyTest): # TODO: test IPv4 in IPv6 encap and vice versa. data = b"" # Empty UDP payload datalen = len(data) + {4: 20, 6: 40}[version] - data += xfrm_base.GetEspTrailer(len(data), IPPROTO_UDP) + data += xfrm_base.GetEspTrailer(len(data), {4: IPPROTO_IPIP, 6: IPPROTO_IPV6}[version]) # TODO: update scapy and use scapy.ESP instead of manually generating ESP header. inner_pkt = xfrm.EspHdr(spi=TEST_SPI, seqnum=1).Pack() + bytes( IpType(src=remoteaddr, dst=myaddr) / |