From patchwork Tue Sep 22 09:27:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 520961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id CCAD0140187 for ; Tue, 22 Sep 2015 19:27:36 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 8F6BA1075B; Tue, 22 Sep 2015 02:27:35 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 9F5B2106F9 for ; Tue, 22 Sep 2015 02:27:34 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 070B4420439 for ; Tue, 22 Sep 2015 03:27:34 -0600 (MDT) X-ASG-Debug-ID: 1442914053-09eadd11e423ea30001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id FbaxcEoicm1iYea6 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 22 Sep 2015 03:27:33 -0600 (MDT) X-Barracuda-Envelope-From: i.maximets@samsung.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mailout3.w1.samsung.com) (210.118.77.13) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES128-SHA encrypted); 22 Sep 2015 09:27:32 -0000 Received-SPF: none (mx1-pf1.cudamail.com: domain at samsung.com does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 210.118.77.13 X-Barracuda-RBL-IP: 210.118.77.13 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NV2002B5NLT2270@mailout3.w1.samsung.com> for dev@openvswitch.org; Tue, 22 Sep 2015 10:27:29 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-04-56011f00f277 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id BC.69.05269.00F11065; Tue, 22 Sep 2015 10:27:28 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NV200CE3NLN9L40@eusync2.samsung.com>; Tue, 22 Sep 2015 10:27:28 +0100 (BST) X-CudaMail-Envelope-Sender: i.maximets@samsung.com From: Ilya Maximets To: dev@openvswitch.org, Gurucharan Shetty X-CudaMail-MID: CM-E1-921005473 X-CudaMail-DTE: 092215 X-CudaMail-Originating-IP: 210.118.77.13 Date: Tue, 22 Sep 2015 12:27:15 +0300 X-ASG-Orig-Subj: [##CM-E1-921005473##][PATCH] poll-loop: fix assertion in poll_create_node Message-id: <1442914035-7869-1-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.1.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMJMWRmVeSWpSXmKPExsVy+t/xK7oM8oxhBqs+6Vr8fSprcfT0HmaL R9evMltcaf/JbnFhSaDFldnTGC0mz5ZyYPc4cHQ7i8ezm/8ZPfq2rGL0eDf/LVsASxSXTUpq TmZZapG+XQJXxqnbb9gLGjkqett3MjYwbmTrYuTkkBAwkfjQOJEdwhaTuHBvPVhcSGApo8Sj ZUZdjFxAdiuTxO9Pl5lAEmwCOhKnVh9h7GLk4BARsJd4+1gEJMwssJ1R4uHLRBBbWMBW4vS7 XrA5LAKqEl/X32EFsXkFXCWmzL/ACrFLTuL88Z/MExi5FzAyrGIUTS1NLihOSs810itOzC0u zUvXS87P3cQICYqvOxiXHrM6xCjAwajEw+vRxxAmxJpYVlyZe4hRgoNZSYTXkJ0xTIg3JbGy KrUoP76oNCe1+BCjNAeLkjjvzF3vQ4QE0hNLUrNTUwtSi2CyTBycUg2MNo/a9yZNU7gd9Yaj 21LVxIg9d9/DzdPuqHpY9Jopcr9m2pug77aJh+314ZmTo+YvvZDht+Fi4+9dhYEfdzRcueKR cPLS90eeNRy7CkQCdNbNif+75+bhFUyTWNfkrjm+72+IyrY70pfn97+9qsfUY1y5/uS34s+H ef0LFbevsg7NzOlbLaz2VImlOCPRUIu5qDgRAEea1bQGAgAA X-GBUdb-Analysis: 0, 210.118.77.13, Ugly c=0 p=0 Source New X-MessageSniffer-Rules: 0-0-0-4498-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442914053 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Cc: Ilya Maximets , Dyasly Sergey Subject: [ovs-dev] [PATCH] poll-loop: fix assertion in poll_create_node X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Zero is a valid value for a file descriptor. Signed-off-by: Ilya Maximets Signed-off-by: Nikita Kalyazin Signed-off-by: to a Reported-by:. --- lib/poll-loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 3c4b55c..36eb5ac 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -104,7 +104,7 @@ poll_create_node(int fd, HANDLE wevent, short int events, const char *where) COVERAGE_INC(poll_create_node); /* Both 'fd' and 'wevent' cannot be set. */ - ovs_assert(!fd != !wevent); + ovs_assert(fd == -1 || !wevent); /* Check for duplicate. If found, "or" the events. */ node = find_poll_node(loop, fd, wevent); @@ -159,7 +159,7 @@ poll_fd_wait_at(int fd, short int events, const char *where) void poll_wevent_wait_at(HANDLE wevent, const char *where) { - poll_create_node(0, wevent, 0, where); + poll_create_node(-1, wevent, 0, where); } #endif /* _WIN32 */