diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index d3fa8fc..b2cb851 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -23732,7 +23732,7 @@ index e246b37735..99559fde91 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 3192207984..2113934310 100644 +index 3192207984..751ad14abf 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -544,16 +544,17 @@ nl_parse_flower_vlan(struct nlattr **attrs, struct tc_flower *flower) @@ -23918,7 +23918,7 @@ index 3192207984..2113934310 100644 { struct { struct tc_pedit sel; -@@ -2416,7 +2448,7 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, +@@ -2416,12 +2448,12 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, continue; } @@ -23927,6 +23927,13 @@ index 3192207984..2113934310 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; @@ -2464,6 +2496,40 @@ nl_msg_put_flower_rewrite_pedits(struct ofpbuf *request, return 0; } diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 0f68d63..0036933 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 109%{?dist} +Release: 110%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Thu Jul 14 2022 Open vSwitch CI - 2.15.0-110 +- Merging upstream branch-2.15 [RH git: b75a6f236b] + Commit list: + 8c7f759b19 tc: Fix misaligned access while creating pedit actions. + + * Wed Jun 29 2022 Open vSwitch CI - 2.15.0-109 - Merging upstream branch-2.15 [RH git: 566da17c56] Commit list: