From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754233AbdC3D7d (ORCPT ); Wed, 29 Mar 2017 23:59:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40010 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751350AbdC3D7b (ORCPT ); Wed, 29 Mar 2017 23:59:31 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 93414883A6 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jasowang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 93414883A6 Subject: Re: [PATCH] virtio_net: fix mergeable bufs error handling To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org References: <1490791050-22046-1-git-send-email-mst@redhat.com> Cc: John Fastabend , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org From: Jason Wang Message-ID: <67f7d42f-7ab5-10f4-80b2-83044ae1048b@redhat.com> Date: Thu, 30 Mar 2017 11:59:21 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <1490791050-22046-1-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 30 Mar 2017 03:59:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017年03月29日 20:37, Michael S. Tsirkin wrote: > On xdp error we try to free head_skb without having > initialized it, that's clearly bogus. > > Fixes: f600b6905015 ("virtio_net: Add XDP support") > Cc: John Fastabend > Signed-off-by: Michael S. Tsirkin > --- > drivers/net/virtio_net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 11773d6..e0fb3707 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -570,7 +570,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > u16 num_buf; > struct page *page; > int offset; > - struct sk_buff *head_skb, *curr_skb; > + struct sk_buff *head_skb = NULL, *curr_skb; > struct bpf_prog *xdp_prog; > unsigned int truesize; > My tree (net.git HEAD is 8f1f7eeb22c16a197159cf7b35d1350695193ead) has: head_skb = NULL; just after the above codes. Thanks