|
 |
9219d1 |
From 9cb2f23877fec13693f27986e4d075152f318d0f Mon Sep 17 00:00:00 2001
|
|
|
9219d1 |
From: Dumitru Ceara <dceara@redhat.com>
|
|
|
9219d1 |
Date: Fri, 28 Aug 2020 14:10:54 +0200
|
|
|
9219d1 |
Subject: [PATCH] ovn-nbctl: Deal with nb_cfg overflows.
|
|
|
9219d1 |
|
|
|
9219d1 |
Reported-at: https://bugzilla.redhat.com/id=1873455
|
|
|
9219d1 |
Reported-by: Ying Xu <yinxu@redhat.com>
|
|
|
9219d1 |
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
|
|
|
9219d1 |
Signed-off-by: Numan Siddique <numans@ovn.org>
|
|
|
9219d1 |
|
|
|
9219d1 |
(cherry-picked from master commit be3a60f8e6a3a01e08ae6fe760279dc4f274562a)
|
|
|
9219d1 |
|
|
|
9219d1 |
(cherry picked from upstream commit 49f322806785cf1195dfa8cfb63531cd1c119e5b)
|
|
|
9219d1 |
|
|
|
9219d1 |
Change-Id: Iba7df83c1d8b88a70fff3c69b985ef46db8d18c4
|
|
|
9219d1 |
---
|
|
|
9219d1 |
utilities/ovn-nbctl.c | 5 +++++
|
|
|
9219d1 |
1 file changed, 5 insertions(+)
|
|
|
9219d1 |
|
|
|
9219d1 |
diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
|
|
|
9219d1 |
index e6d8dbe..bd66ee6 100644
|
|
|
9219d1 |
--- a/utilities/ovn-nbctl.c
|
|
|
9219d1 |
+++ b/utilities/ovn-nbctl.c
|
|
|
9219d1 |
@@ -6080,6 +6080,11 @@ do_nbctl(const char *args, struct ctl_command *commands, size_t n_commands,
|
|
|
9219d1 |
nb = nbrec_nb_global_insert(txn);
|
|
|
9219d1 |
}
|
|
|
9219d1 |
|
|
|
9219d1 |
+ /* Deal with potential overflows. */
|
|
|
9219d1 |
+ if (nb->nb_cfg == LLONG_MAX) {
|
|
|
9219d1 |
+ nbrec_nb_global_set_nb_cfg(nb, 0);
|
|
|
9219d1 |
+ }
|
|
|
9219d1 |
+
|
|
|
9219d1 |
if (wait_type != NBCTL_WAIT_NONE) {
|
|
|
9219d1 |
ovsdb_idl_txn_increment(txn, &nb->header_, &nbrec_nb_global_col_nb_cfg,
|
|
|
9219d1 |
force_wait);
|
|
|
9219d1 |
--
|
|
|
9219d1 |
1.8.3.1
|
|
|
9219d1 |
|