{"id":810818,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810818/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504736647-15435-1-git-send-email-azhou@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504736647-15435-1-git-send-email-azhou@ovn.org>","list_archive_url":null,"date":"2017-09-06T22:24:07","name":"[ovs-dev] bridge: Fix controller status update to passive connections","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"71c417f11f9afe3d1ff17a8a90b78d4d4620d0b5","submitter":{"id":67699,"url":"http://patchwork.ozlabs.org/api/1.2/people/67699/?format=json","name":"Andy Zhou","email":"azhou@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504736647-15435-1-git-send-email-azhou@ovn.org/mbox/","series":[{"id":1892,"url":"http://patchwork.ozlabs.org/api/1.2/series/1892/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=1892","date":"2017-09-06T22:24:07","name":"[ovs-dev] bridge: Fix controller status update to passive connections","version":1,"mbox":"http://patchwork.ozlabs.org/series/1892/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810818/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810818/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 3xndSN60mHz9s82\n\tfor ;\n\tThu, 7 Sep 2017 08:25:07 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 66A5DBD4;\n\tWed, 6 Sep 2017 22:25:06 +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 034C4B7B\n\tfor ; Wed, 6 Sep 2017 22:25:05 +0000 (UTC)","from mail-pf0-f196.google.com (mail-pf0-f196.google.com\n\t[209.85.192.196])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3A97F432\n\tfor ; Wed, 6 Sep 2017 22:25:04 +0000 (UTC)","by mail-pf0-f196.google.com with SMTP id f84so1731568pfj.3\n\tfor ; Wed, 06 Sep 2017 15:25:04 -0700 (PDT)","from centos.eng.vmware.com ([208.91.1.34])\n\tby smtp.gmail.com with ESMTPSA id\n\to11sm769046pgp.88.2017.09.06.15.25.02\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 06 Sep 2017 15:25:03 -0700 (PDT)"],"X-Greylist":"whitelisted by SQLgrey-1.7.6","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id\n\t:content-transfer-encoding;\n\tbh=HmkiOdAS/BqMvlCzKyuzSO9k3wniyhKVnzCKOtts4Ek=;\n\tb=EXyrvU+8RtzCZGUY/VXJyAxOg/l6xzQ0m+DTmaHHnnspddnzpbU6Xu6g5k7/HvG1+S\n\tO2oO5FF7rQ/e1G2bLJZC4vAH5S8CNBrqgSEqJBTB7+MkMgcs8Ng8SJQG/QL6mZHbKh2X\n\tAvJGtllO7XYU81wrlwwpiKD23CEDOd0CVgA4XJYYdqZrXs/DrD3i9KKTDklUZThyUpff\n\tQtCtmMdHfviMC+o7ZVVWUuZOi5jUE35l9UyyaA4xagEEvQh2SsAixNX5rLUQ2KYlsn4g\n\tWKv5afxUMQrTNtYGEWXJpTsUwYOubexWkypoqkOcIvjDo5SowomIAu1tRKH6tfuf4suS\n\t9fvQ==","X-Gm-Message-State":"AHPjjUim5k19J+A1i6mO6REr/Ee9NUlske9tUUWcNz5ugQH5E2ESPC4S\n\tmngK6u3QA42iV/Mo","X-Google-Smtp-Source":"ADKCNb5VJgzjv1bWJ/kmJeuQTeVT4kh3P3laUupPXzfNg3eA8rpnBE1GymWv7LLXDAyljQXE0modvg==","X-Received":"by 10.84.217.153 with SMTP id p25mr672329pli.213.1504736703790; \n\tWed, 06 Sep 2017 15:25:03 -0700 (PDT)","From":"Andy Zhou ","To":"dev@openvswitch.org","Date":"Wed, 6 Sep 2017 15:24:07 -0700","Message-Id":"<1504736647-15435-1-git-send-email-azhou@ovn.org>","X-Mailer":"git-send-email 1.8.3.1","X-Spam-Status":"No, score=0.5 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE,\n\tRCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"[ovs-dev] [PATCH] bridge: Fix controller status update to passive\n\tconnections","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":"The bug can cause ovs-vswitchd to crash (due to assert) when it is\nset up with a passive controller connection. Since only active\nconnections are kept, the passive connection status update should be\nignored and not trigger asserts.\n\nReported-by: Josh Bailey \nSigned-off-by: Andy Zhou \n---\n AUTHORS.rst | 1 +\n vswitchd/bridge.c | 12 +++++++-----\n 2 files changed, 8 insertions(+), 5 deletions(-)","diff":"diff --git a/AUTHORS.rst b/AUTHORS.rst\nindex cb0cd91b21ba..e304609b2b27 100644\n--- a/AUTHORS.rst\n+++ b/AUTHORS.rst\n@@ -389,6 +389,7 @@ Ben Basler bbasler@nicira.com\n Bhargava Shastry bshastry@sec.t-labs.tu-berlin.de\n Bob Ball bob.ball@citrix.com\n Brad Hall brad@nicira.com\n+Brailey Josh josh@faucet.nz\n Brandon Heller brandonh@stanford.edu\n Brendan Kelley bkelley@nicira.com\n Brent Salisbury brent.salisbury@gmail.com\ndiff --git a/vswitchd/bridge.c b/vswitchd/bridge.c\nindex a8cbae78cb23..00f86182c820 100644\n--- a/vswitchd/bridge.c\n+++ b/vswitchd/bridge.c\n@@ -2720,11 +2720,13 @@ refresh_controller_status(void)\n struct ofproto_controller_info *cinfo =\n shash_find_data(&info, cfg->target);\n \n- ovs_assert(cinfo);\n- ovsrec_controller_set_is_connected(cfg, cinfo->is_connected);\n- const char *role = ofp12_controller_role_to_str(cinfo->role);\n- ovsrec_controller_set_role(cfg, role);\n- ovsrec_controller_set_status(cfg, &cinfo->pairs);\n+ /* cinfo is NULL when 'cfg->target' is a passive connection. */\n+ if (cinfo) {\n+ ovsrec_controller_set_is_connected(cfg, cinfo->is_connected);\n+ const char *role = ofp12_controller_role_to_str(cinfo->role);\n+ ovsrec_controller_set_role(cfg, role);\n+ ovsrec_controller_set_status(cfg, &cinfo->pairs);\n+ }\n }\n \n ofproto_free_ofproto_controller_info(&info);\n","prefixes":["ovs-dev"]}