{"id":815907,"url":"http://patchwork.ozlabs.org/api/patches/815907/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-30-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919220125.32535-30-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:01:02","name":"[ovs-dev,RFC,29/52] jsonrpc-server: Enforce uniqueness of monitor IDs.","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"92fa59ab38d7201fbd16c3d183e86c880b4e6f8b","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-30-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975","date":"2017-09-19T22:00:34","name":"clustering implementation","version":1,"mbox":"http://patchwork.ozlabs.org/series/3975/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815907/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815907/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxcyX6zxXz9sBW\n\tfor ;\n\tWed, 20 Sep 2017 08:30:28 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 5C47FD6B;\n\tTue, 19 Sep 2017 22:21:04 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 4C38BD51\n\tfor ; Tue, 19 Sep 2017 22:21:02 +0000 (UTC)","from slow1-d.mail.gandi.net (slow1-d.mail.gandi.net\n\t[217.70.178.86])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTP id E20AD159\n\tfor ; Tue, 19 Sep 2017 22:21:01 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby slow1-d.mail.gandi.net (Postfix) with ESMTP id C4E01534EC2\n\tfor ; Wed, 20 Sep 2017 00:02:18 +0200 (CEST)","from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 47ED8172094;\n\tWed, 20 Sep 2017 00:02:16 +0200 (CEST)"],"X-Greylist":"from auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:01:02 -0700","Message-Id":"<20170919220125.32535-30-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170919220125.32535-1-blp@ovn.org>","References":"<20170919220125.32535-1-blp@ovn.org>","X-Spam-Status":"No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH RFC 29/52] jsonrpc-server: Enforce uniqueness of\n\tmonitor IDs.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"This oversight allowed monitor IDs to be duplicated when the\nmonitor_cond_change request changed them.\n\nSigned-off-by: Ben Pfaff \n---\n ovsdb/jsonrpc-server.c | 18 ++++++++++++++----\n 1 file changed, 14 insertions(+), 4 deletions(-)","diff":"diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c\nindex 1bc1f06c4ce2..555f87e55f3e 100644\n--- a/ovsdb/jsonrpc-server.c\n+++ b/ovsdb/jsonrpc-server.c\n@@ -1420,6 +1420,14 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,\n goto error;\n }\n \n+ struct ovsdb_jsonrpc_monitor *m2\n+ = ovsdb_jsonrpc_monitor_find(s, params->u.array.elems[1]);\n+ if (m2 && m2 != m) {\n+ error = ovsdb_syntax_error(params->u.array.elems[1], NULL,\n+ \"duplicate monitor ID\");\n+ goto error;\n+ }\n+\n monitor_cond_change_reqs = params->u.array.elems[2];\n if (monitor_cond_change_reqs->type != JSON_OBJECT) {\n error =\n@@ -1467,10 +1475,12 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,\n }\n \n /* Change monitor id */\n- hmap_remove(&s->monitors, &m->node);\n- json_destroy(m->monitor_id);\n- m->monitor_id = json_clone(params->u.array.elems[1]);\n- hmap_insert(&s->monitors, &m->node, json_hash(m->monitor_id, 0));\n+ if (m != m2) {\n+ hmap_remove(&s->monitors, &m->node);\n+ json_destroy(m->monitor_id);\n+ m->monitor_id = json_clone(params->u.array.elems[1]);\n+ hmap_insert(&s->monitors, &m->node, json_hash(m->monitor_id, 0));\n+ }\n \n /* Send the new update, if any, represents the difference from the old\n * condition and the new one. */\n","prefixes":["ovs-dev","RFC","29/52"]}