From cfcf5ba5cb2d8b44c93151afa421191c4304a289 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Mar 30 2023 00:57:32 +0000 Subject: Import openvswitch2.17-2.17.0-76 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index d854c86..78257c4 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -54217,7 +54217,7 @@ index 94dc6a9b74..303b99daf4 100644 .queue = rss_data->queue, .key_len = 0, diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c -index 9845e8d3fe..19eae7bd20 100644 +index 9845e8d3fe..efb92d5dd7 100644 --- a/lib/netdev-offload-tc.c +++ b/lib/netdev-offload-tc.c @@ -44,6 +44,7 @@ @@ -54539,7 +54539,7 @@ index 9845e8d3fe..19eae7bd20 100644 } if (action->ct.nat_type) { -@@ -1048,14 +1137,15 @@ netdev_tc_flow_dump_next(struct netdev_flow_dump *dump, +@@ -1048,23 +1137,28 @@ netdev_tc_flow_dump_next(struct netdev_flow_dump *dump, get_tc_qdisc_hook(netdev)); while (nl_dump_next(dump->nl_dump, &nl_flow, rbuffer)) { @@ -54557,7 +54557,11 @@ index 9845e8d3fe..19eae7bd20 100644 continue; } -@@ -1065,6 +1155,10 @@ netdev_tc_flow_dump_next(struct netdev_flow_dump *dump, +- if (flower.act_cookie.len) { +- *ufid = *((ovs_u128 *) flower.act_cookie.data); ++ if (flower.act_cookie.len >= sizeof *ufid) { ++ *ufid = get_32aligned_u128(flower.act_cookie.data); + } else if (!find_ufid(netdev, &id, ufid)) { continue; } diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 02eaa8c..181b9e4 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 75%{?dist} +Release: 76%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -748,6 +748,12 @@ exit 0 %endif %changelog +* Wed Mar 29 2023 Open vSwitch CI - 2.17.0-76 +- Merging upstream branch-2.17 [RH git: d63f1374ab] + Commit list: + 4f41e58bc6 netdev-tc-offloads: Fix misaligned 8 byte read. + + * Tue Mar 28 2023 David Marchand - 2.17.0-75 - net/i40e: revert link status check on device start [RH git: 79a3a95a21] (#2138116) [ upstream commit a8ca8edf8c076c765c6d142ab4664a1f61414233 ]