diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2020-01-15 10:30:48 +0000 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2020-01-15 21:37:55 +0000 |
| commit | 8ad070e10246536fc1c514cbf16f2c51030cbee0 (patch) | |
| tree | ab56829a26064495f7083c66a74fa9e7f3018863 /src/vnet/buffer.h | |
| parent | e5060b33bd680aef7fb0ba80a5123532f07e6300 (diff) | |
ip: align reass.save_rewrite_lengthv20.05-rc0
By aligning vnet_buffer_opaque.ip.save_rewrite_length and
vnet_buffer_opaque.ip.reass.save_rewrite_length we prevent shallow
virtual reassembly code from overwrite save_rewrite_length, allowing
other features down the pipe to rely on this value.
A static assert is added to guard this alignment.
Type: fix
Fixes: f126e746fc01c75bc99329d10ce9127b26b23814
Change-Id: Ie7c7f3abc2a221bbcf2830c0f006a4368088b342
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/buffer.h')
| -rw-r--r-- | src/vnet/buffer.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h index b174587efdd..52935612277 100644 --- a/src/vnet/buffer.h +++ b/src/vnet/buffer.h @@ -209,13 +209,13 @@ typedef struct /* shallow virtual reassembly output variables */ struct { - u8 ip_proto; /* protocol in ip header */ - u8 icmp_type_or_tcp_flags; - u8 is_non_first_fragment; - u8 save_rewrite_length; u16 l4_src_port; /* tcp/udp/icmp src port */ u16 l4_dst_port; /* tcp/udp/icmp dst port */ u32 tcp_ack_number; + u8 save_rewrite_length; + u8 ip_proto; /* protocol in ip header */ + u8 icmp_type_or_tcp_flags; + u8 is_non_first_fragment; u32 tcp_seq_number; }; /* full reassembly output variables */ @@ -397,6 +397,15 @@ STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) && VNET_REWRITE_TOTAL_BYTES < UINT8_MAX, "save_rewrite_length member must be able to hold the max value of rewrite length"); +STATIC_ASSERT (STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) + == STRUCT_OFFSET_OF (vnet_buffer_opaque_t, + ip.reass.save_rewrite_length) + && STRUCT_OFFSET_OF (vnet_buffer_opaque_t, + mpls.save_rewrite_length) == + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, + ip.reass.save_rewrite_length), + "save_rewrite_length must be aligned so that reass doesn't overwrite it"); + /* * The opaque field of the vlib_buffer_t is interpreted as a * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one. |