From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH net-next v3] net: sched: fix skb leak in dev_requeue_skb() Date: Tue, 02 Jan 2018 13:49:11 -0500 (EST) Message-ID: <20180102.134911.1471297664330738902.davem@davemloft.net> References: <1514365552-150962-1-git-send-email-weiyongjun1@huawei.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: john.fastabend@gmail.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org To: weiyongjun1@huawei.com Return-path: Received: from shards.monkeyblade.net ([184.105.139.130]:50904 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbeABStN (ORCPT ); Tue, 2 Jan 2018 13:49:13 -0500 In-Reply-To: <1514365552-150962-1-git-send-email-weiyongjun1@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Wei Yongjun Date: Wed, 27 Dec 2017 17:05:52 +0800 > When dev_requeue_skb() is called with bluked skb list, only the ^^^^^^ "bulked" > first skb of the list will be requeued to qdisc layer, and leak > the others without free them. > > TCP is broken due to skb leak since no free skb will be considered > as still in the host queue and never be retransmitted. This happend > when dev_requeue_skb() called from qdisc_restart(). > qdisc_restart > |-- dequeue_skb > |-- sch_direct_xmit() > |-- dev_requeue_skb() <-- skb may bluked > > Fix dev_requeue_skb() to requeue the full bluked list. Also change > to use __skb_queue_tail() in __dev_requeue_skb() to avoid skb out > of order. > > Fixes: a53851e2c321 ("net: sched: explicit locking in gso_cpu fallback") > Signed-off-by: Wei Yongjun > --- > v2 -> v3: move lock out of while loop Applied, thank you.