diff options
| author | Dumitru Ceara <dceara@redhat.com> | 2022-04-11 13:38:13 +0200 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2022-05-17 23:09:50 +0200 |
| commit | 933aaf9444a6e109d360425a98aac6cd0891ef60 (patch) | |
| tree | 8d33c86b732f7308d9004468a1960ece20ed569f /tests | |
| parent | 471babb8117aebbe42b2e1059c6f3c9d76fc11c1 (diff) | |
| download | openvswitch-933aaf9444a6e109d360425a98aac6cd0891ef60.tar.gz | |
ofp-actions: Ensure aligned accesses to masked fields.
For example is parsing the OVN "eth.dst[40] = 1;" action, which
triggered the following warning from UndefinedBehaviorSanitizer:
lib/meta-flow.c:3210:9:
runtime error: member access within misaligned address 0x000000de4e36
for type 'const union mf_value', which requires 8 byte alignment
0x000000de4e36: note: pointer points here
00 00 00 00 01 00 00 00 00 00 00 00 00 00 70 4e de 00 00 00 00 00
^
10 51 de 00 00 00 00 00 c0 4f
0 0x5818bc in mf_format lib/meta-flow.c:3210
1 0x5b6047 in format_SET_FIELD lib/ofp-actions.c:3342
2 0x5d68ab in ofpact_format lib/ofp-actions.c:9213
3 0x5d6ee0 in ofpacts_format lib/ofp-actions.c:9237
4 0x410922 in test_parse_actions tests/test-ovn.c:1360
To avoid this we now change the internal representation of the set_field
actions, struct ofpact_set_field, such that the mask is always stored
at a correctly aligned address, multiple of OFPACT_ALIGNTO.
We also need to adapt the "ovs-ofctl show-flows - Oversized flow" test
because now the ofpact representation of the set_field action uses more
bytes in memory (for the extra alignment). Change the test to use
dec_ttl instead.
Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ovs-ofctl.at | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 267711bfa..858dcda1f 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -3258,7 +3258,7 @@ AT_SETUP([ovs-ofctl show-flows - Oversized flow]) OVS_VSWITCHD_START printf " priority=90,icmp,reg15=0x8005,metadata=0x1,nw_dst=11.0.0.1,icmp_type=8,icmp_code=0 actions=" > flow.txt -for i in `seq 1 1022`; do printf "set_field:0x399->reg13,set_field:0x$i->reg15,resubmit(,39),"; done >> flow.txt +for i in `seq 1 2045`; do printf "dec_ttl,resubmit(,39),"; done >> flow.txt printf "resubmit(,39)\n" >> flow.txt AT_CHECK([ovs-ofctl -O OpenFlow15 add-flows br0 flow.txt]) |