From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1altCG-0006TG-Ao for qemu-devel@nongnu.org; Fri, 01 Apr 2016 03:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1altCD-0005YZ-5E for qemu-devel@nongnu.org; Fri, 01 Apr 2016 03:08:44 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:60851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1altCC-0005XA-3Y for qemu-devel@nongnu.org; Fri, 01 Apr 2016 03:08:41 -0400 From: zhanghailiang Date: Fri, 1 Apr 2016 15:08:09 +0800 Message-ID: <1459494489-3532-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] filter-buffer: fix segfault while start qemu with status=off property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, zhanghailiang After commit 338d3f, we support 'status' property for filter object. The segfault can be triggered by starting qemu with 'status=off' property for filter, when the s->incoming_queue is NULL, we reference it directly in qemu_net_queue_flush(). Let's check the value of 's->incoming_queue' before calling qemu_net_queue_flush(). Signed-off-by: zhanghailiang --- net/filter-buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/filter-buffer.c b/net/filter-buffer.c index cc6bd94..79e2ce3 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -34,7 +34,7 @@ static void filter_buffer_flush(NetFilterState *nf) { FilterBufferState *s = FILTER_BUFFER(nf); - if (!qemu_net_queue_flush(s->incoming_queue)) { + if (s->incoming_queue && !qemu_net_queue_flush(s->incoming_queue)) { /* Unable to empty the queue, purge remaining packets */ qemu_net_queue_purge(s->incoming_queue, nf->netdev); } -- 1.8.3.1