diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index a973d35..55f5101 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -4891,7 +4891,7 @@ index fcaddf10ad..71039e24f1 100644 /* Attempts to guess the content type of a stream whose first few bytes were diff --git a/lib/tc.c b/lib/tc.c -index 38a1dfc0eb..df73a43d4c 100644 +index 38a1dfc0eb..eb44b336e0 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -568,16 +568,17 @@ nl_parse_flower_vlan(struct nlattr **attrs, struct tc_flower *flower) @@ -5107,7 +5107,7 @@ index 38a1dfc0eb..df73a43d4c 100644 { struct { struct tc_pedit sel; -@@ -2497,7 +2526,7 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, +@@ -2497,12 +2526,12 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, continue; } @@ -5116,6 +5116,13 @@ index 38a1dfc0eb..df73a43d4c 100644 &first_word_mask, &mask, &data); for (j = 0; j < cnt; j++, mask++, data++, cur_offset += 4) { +- ovs_be32 mask_word = *mask; +- ovs_be32 data_word = *data; ++ ovs_be32 mask_word = get_unaligned_be32(mask); ++ ovs_be32 data_word = get_unaligned_be32(data); + + if (j == 0) { + mask_word &= first_word_mask; @@ -2545,6 +2574,40 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, return 0; } diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index 29dd560..43d22a1 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 86%{?dist} +Release: 87%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Thu Jul 14 2022 Open vSwitch CI - 2.16.0-87 +- Merging upstream branch-2.16 [RH git: 092b9c8e76] + Commit list: + 997ba4ee77 tc: Fix misaligned access while creating pedit actions. + + * Wed Jun 29 2022 Open vSwitch CI - 2.16.0-86 - Merging upstream branch-2.16 [RH git: c1bbe117f8] Commit list: