diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 171520f..a5fa5cd 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -3152,7 +3152,7 @@ index 61e405460a..d33cee8543 100644 } diff --git a/lib/dpctl.c b/lib/dpctl.c -index d12d9b8a5e..41b23d8aeb 100644 +index d12d9b8a5e..e9110462d2 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -673,7 +673,7 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p) @@ -3164,7 +3164,32 @@ index d12d9b8a5e..41b23d8aeb 100644 continue; } -@@ -1713,10 +1713,16 @@ dpctl_flush_conntrack(int argc, const char *argv[], +@@ -1343,19 +1343,17 @@ static int + dpctl_del_flow_dpif(struct dpif *dpif, const char *key_s, + struct dpctl_params *dpctl_p) + { ++ struct dpif_port_dump port_dump; + struct dpif_flow_stats stats; ++ bool ufid_generated = false; + struct dpif_port dpif_port; +- struct dpif_port_dump port_dump; +- struct ofpbuf key; ++ bool ufid_present = false; ++ struct simap port_names; + struct ofpbuf mask; /* To be ignored. */ +- ++ struct ofpbuf key; + ovs_u128 ufid; +- bool ufid_generated; +- bool ufid_present; +- struct simap port_names; + int n, error; + +- ufid_present = false; + n = odp_ufid_from_string(key_s, &ufid); + if (n < 0) { + dpctl_error(dpctl_p, -n, "parsing flow ufid"); +@@ -1713,10 +1711,16 @@ dpctl_flush_conntrack(int argc, const char *argv[], uint16_t zone, *pzone = NULL; int error; int args = argc - 1; @@ -3183,7 +3208,7 @@ index d12d9b8a5e..41b23d8aeb 100644 ds_put_cstr(&ds, "failed to parse zone"); error = EINVAL; goto error; -@@ -1744,7 +1750,7 @@ dpctl_flush_conntrack(int argc, const char *argv[], +@@ -1744,7 +1748,7 @@ dpctl_flush_conntrack(int argc, const char *argv[], } /* Report error if there is more than one unparsed argument. */ @@ -3192,7 +3217,7 @@ index d12d9b8a5e..41b23d8aeb 100644 ds_put_cstr(&ds, "invalid arguments"); error = EINVAL; goto error; -@@ -2196,7 +2202,7 @@ parse_ct_limit_zones(const char *argv, struct ovs_list *zone_limits, +@@ -2196,7 +2200,7 @@ parse_ct_limit_zones(const char *argv, struct ovs_list *zone_limits, argcopy = xstrdup(argv + 5); next_zone = strtok_r(argcopy, ",", &save_ptr); @@ -3201,7 +3226,7 @@ index d12d9b8a5e..41b23d8aeb 100644 if (ovs_scan(next_zone, "%"SCNu16, &zone)) { ct_dpif_push_zone_limit(zone_limits, zone, 0, 0); } else { -@@ -2204,7 +2210,8 @@ parse_ct_limit_zones(const char *argv, struct ovs_list *zone_limits, +@@ -2204,7 +2208,8 @@ parse_ct_limit_zones(const char *argv, struct ovs_list *zone_limits, free(argcopy); return EINVAL; } @@ -6154,6 +6179,36 @@ index 2fe6c540a7..d1d2ae6f20 100644 void smap_replace(struct smap *, const char *, const char *); void smap_replace_nocopy(struct smap *, const char *, char *); +diff --git a/lib/socket-util.c b/lib/socket-util.c +index 3eb3a3816b..b3f541b6db 100644 +--- a/lib/socket-util.c ++++ b/lib/socket-util.c +@@ -546,9 +546,15 @@ inet_parse_active(const char *target_, int default_port, + if (!host) { + VLOG_ERR("%s: host must be specified", target_); + ok = false; ++ if (dns_failure) { ++ *dns_failure = false; ++ } + } else if (!port && default_port < 0) { + VLOG_ERR("%s: port must be specified", target_); + ok = false; ++ if (dns_failure) { ++ *dns_failure = false; ++ } + } else { + ok = parse_sockaddr_components(ss, host, port, default_port, + target_, resolve_host, dns_failure); +@@ -671,6 +677,9 @@ inet_parse_passive(const char *target_, int default_port, + if (!port && default_port < 0) { + VLOG_ERR("%s: port must be specified", target_); + ok = false; ++ if (dns_failure) { ++ *dns_failure = false; ++ } + } else { + ok = parse_sockaddr_components(ss, host, port, default_port, + target_, resolve_host, dns_failure); diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 62da9febb6..86747e58ba 100644 --- a/lib/stream-ssl.c diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index d24f896..fb2ade8 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 111%{?dist} +Release: 112%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -754,6 +754,13 @@ exit 0 %endif %changelog +* Tue May 28 2024 Open vSwitch CI - 3.1.0-112 +- Merging upstream branch-3.1 [RH git: 5a2eb3a41e] + Commit list: + 6767ac6c6c socket: Fix uninitialized values in inet_parse_ functions. + 0ab3811f6a dpctl: Fix uninitialized value when deleting flows. + + * Thu May 23 2024 Open vSwitch CI - 3.1.0-111 - Merging upstream branch-3.1 [RH git: 8dcf26eb16] Commit list: