From 2ba8cbcbe26a62007c560808d59d354607d26b25 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 10 2021 21:03:42 +0000
Subject: Import openvswitch2.15-2.15.0-16 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 2670296..91f25dd 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -812,6 +812,19 @@ index e2e829772a..0342a228b7 100644
      encap->n_props = n_props;
      out->header = &encap->ofpact;
      ofpact_finish_ENCAP(out, &encap);
+diff --git a/lib/ofp-group.c b/lib/ofp-group.c
+index bf0f8af544..737f48047b 100644
+--- a/lib/ofp-group.c
++++ b/lib/ofp-group.c
+@@ -64,7 +64,7 @@ ofputil_group_from_string(const char *s, uint32_t *group_idp)
+ void
+ ofputil_format_group(uint32_t group_id, struct ds *s)
+ {
+-    char name[MAX_GROUP_NAME_LEN];
++    char name[MAX_GROUP_NAME_LEN + 1];
+ 
+     ofputil_group_to_string(group_id, name, sizeof name);
+     ds_put_cstr(s, name);
 diff --git a/lib/ovsdb-cs.c b/lib/ovsdb-cs.c
 index ff8adaefb5..6f9f912ac4 100644
 --- a/lib/ovsdb-cs.c
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 9847dfd..fb88a89 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: 15%{?dist}
+Release: 16%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -697,6 +697,12 @@ exit 0
 %endif
 
 %changelog
+* Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.15.0-16
+- Merging upstream branch-2.15 [RH gerrit: dbd5501f48]
+    Commit list:
+    255c38c745 ofp-group: Use big-enough buffer in ofputil_format_group().
+
+
 * Wed Apr 21 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.15.0-15
 - Merging upstream branch-2.15 [RH gerrit: 85f5aecb83]
     Commit list: