{"id":812038,"url":"http://patchwork.ozlabs.org/api/1.2/patches/812038/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1505023105-90302-1-git-send-email-zhouhan@gmail.com/","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":"<1505023105-90302-1-git-send-email-zhouhan@gmail.com>","list_archive_url":null,"date":"2017-09-10T05:58:25","name":"[ovs-dev] ovn-controller: Fix empty address set parsing problem.","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"404c46cda51f2df05206bbbafde43c4ad4e7e7f8","submitter":{"id":67381,"url":"http://patchwork.ozlabs.org/api/1.2/people/67381/?format=json","name":"Han Zhou","email":"zhouhan@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/1505023105-90302-1-git-send-email-zhouhan@gmail.com/mbox/","series":[{"id":2366,"url":"http://patchwork.ozlabs.org/api/1.2/series/2366/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=2366","date":"2017-09-10T05:58:25","name":"[ovs-dev] ovn-controller: Fix empty address set parsing problem.","version":1,"mbox":"http://patchwork.ozlabs.org/series/2366/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812038/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812038/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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"SqMgFbRW\"; dkim-atps=neutral"],"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 3xqgN74zYPz9sRV\n\tfor ;\n\tSun, 10 Sep 2017 15:58:31 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 2D669949;\n\tSun, 10 Sep 2017 05:58:28 +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 384E492B\n\tfor ; Sun, 10 Sep 2017 05:58:26 +0000 (UTC)","from mail-pg0-f54.google.com (mail-pg0-f54.google.com\n\t[74.125.83.54])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 74EDFA1\n\tfor ; Sun, 10 Sep 2017 05:58:25 +0000 (UTC)","by mail-pg0-f54.google.com with SMTP id j16so215851pga.1\n\tfor ; Sat, 09 Sep 2017 22:58:25 -0700 (PDT)","from localhost.localdomain.localdomain ([216.113.160.71])\n\tby smtp.gmail.com with ESMTPSA id\n\ti87sm754583pfi.184.2017.09.09.22.58.24\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 09 Sep 2017 22:58:24 -0700 (PDT)"],"X-Greylist":"whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=zzSH1KnnP6kj+dylJ7OX4z+9jFkpTsINCZxeI/RpuzA=;\n\tb=SqMgFbRWEkYM52OKlJL/YwPhK7Z8hB6wQLIANDlpFQL09NcPLzsciKdZr0x5ZRvlhH\n\tI6SFnkpJ7KhygGKTy83RdWiD5IdXLRWE7SvIn382YNdxrgCTM/vfd8w7y7lo6f8Un2Ts\n\t77vaR13uJ6EcC3/u7SovQVH+JtHeLiUAoBs9DTQ//cHxXsG6rRQMZMfmBOLtSzPtEVlJ\n\tC51Pt2l+lAQcWxTPprE+n8fVkyxvJZoM1PuBSSsNWT916emK+Ks2bmhnIO034PwwTvx4\n\tE0A7O7AU/l7gJ4zc0kjezDacdFJhirXTJ9Nr9pSRsxeq+/hx+qnI5FHXxYH5D0+ap0T0\n\t4W4Q==","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\tbh=zzSH1KnnP6kj+dylJ7OX4z+9jFkpTsINCZxeI/RpuzA=;\n\tb=JhOQreOfOGBPHRRN8XQzJGUvTsfRM7xUGFeinDdwDyPBi80KHwY9FXE3aAlOIR184s\n\t89YQyGnxmRMRO8T+RoUFPZkz3F4MDOMEEM/rcpzcURfD7TbB7TWiOJB109H0mw2Mw7/G\n\tIYEuiGhhk6owJei8vV7W7ehZI8v/N/u7ThBxvFnoj9Ryk9cs/xssVlHPwK6RrJ5kuPEh\n\tyJIkfro129ArsPu4OgSf52ulEI0/D06PXkr1Ol2TiuTrtFtH2pL/1sLS5y9I0eO9Vxqa\n\tObrFqnAfYmQRQtb06Nt983bU76Jlnc/D+RzbK9S8V1Un7E5cVBkJ/V3/MlG6yXGWGQPx\n\trUyQ==","X-Gm-Message-State":"AHPjjUgkHgYlBZxjzPaOwGx32R+dOWo179TBl7jARhtOYVi60kQVJ6OL\n\tDzhChhtB4Urs8EGB","X-Google-Smtp-Source":"ADKCNb4o/3sApUaM9Z2JeizEoLCC4UYD0stBBtUGEVj0sDngDmJpnsr1JGq++ZkQXrx41mohTLnj6g==","X-Received":"by 10.84.245.16 with SMTP id i16mr9170012pll.373.1505023104863; \n\tSat, 09 Sep 2017 22:58:24 -0700 (PDT)","From":"Han Zhou ","To":"dev@openvswitch.org","Date":"Sat, 9 Sep 2017 22:58:25 -0700","Message-Id":"<1505023105-90302-1-git-send-email-zhouhan@gmail.com>","X-Mailer":"git-send-email 2.1.0","X-Spam-Status":"No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE autolearn=disabled\n\tversion=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"[ovs-dev] [PATCH] ovn-controller: Fix empty address set parsing\n\tproblem.","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":"When an address set is empty, current implementation will generate\nan ovs flow that matches random things (and in most cases matching\neverything) due to a problem in expression parser of constant set.\nThis patch fixes it by replacing the expression by a boolean false\nwhen the set is empty, and adds tests cases accordingly.\n\nReported-by: Guru Shetty \nReported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-September/338441.html\nSigned-off-by: Han Zhou \n---\n ovn/lib/expr.c | 4 ++++\n tests/ovn.at | 9 +++++++++\n tests/test-ovn.c | 2 ++\n 3 files changed, 15 insertions(+)","diff":"diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c\nindex 060e9ee..6a731de 100644\n--- a/ovn/lib/expr.c\n+++ b/ovn/lib/expr.c\n@@ -612,6 +612,10 @@ make_cmp(struct expr_context *ctx,\n }\n }\n \n+ if (!cs->n_values) {\n+ e = expr_create_boolean(false);\n+ goto exit;\n+ }\n e = make_cmp__(f, r, &cs->values[0]);\n for (size_t i = 1; i < cs->n_values; i++) {\n e = expr_combine(r == EXPR_R_EQ ? EXPR_T_OR : EXPR_T_AND,\ndiff --git a/tests/ovn.at b/tests/ovn.at\nindex bb9999c..5608555 100644\n--- a/tests/ovn.at\n+++ b/tests/ovn.at\n@@ -623,6 +623,15 @@ dl_src=00:00:00:00:00:02\n dl_src=00:00:00:00:00:03\n dl_src=ba:be:be:ef:de:ad\n ])\n+AT_CHECK([expr_to_flow 'ip4.src == {$set4}'], [0], [dnl\n+(no flows)\n+])\n+AT_CHECK([expr_to_flow 'ip4.src == {1.2.3.4, $set4}'], [0], [dnl\n+ip,nw_src=1.2.3.4\n+])\n+AT_CHECK([expr_to_flow 'ip4.src == 1.2.3.4 || ip4.src == {$set4}'], [0], [dnl\n+ip,nw_src=1.2.3.4\n+])\n AT_CLEANUP\n \n AT_SETUP([ovn -- action parsing])\ndiff --git a/tests/test-ovn.c b/tests/test-ovn.c\nindex 694bc79..148ce12 100644\n--- a/tests/test-ovn.c\n+++ b/tests/test-ovn.c\n@@ -202,10 +202,12 @@ create_addr_sets(struct shash *addr_sets)\n static const char *const addrs3[] = {\n \"00:00:00:00:00:01\", \"00:00:00:00:00:02\", \"00:00:00:00:00:03\",\n };\n+ static const char *const addrs4[] = {};\n \n expr_addr_sets_add(addr_sets, \"set1\", addrs1, 3);\n expr_addr_sets_add(addr_sets, \"set2\", addrs2, 3);\n expr_addr_sets_add(addr_sets, \"set3\", addrs3, 3);\n+ expr_addr_sets_add(addr_sets, \"set4\", addrs4, 0);\n }\n \n static bool\n","prefixes":["ovs-dev"]}