From patchwork Tue Sep 1 00:55:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 1354666 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BgTGz1XWfz9sTM for ; Tue, 1 Sep 2020 10:59:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726249AbgIAA7D (ORCPT ); Mon, 31 Aug 2020 20:59:03 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:44932 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725872AbgIAA7C (ORCPT ); Mon, 31 Aug 2020 20:59:02 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 740091D2606C0AE80B4C; Tue, 1 Sep 2020 08:58:59 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Sep 2020 08:58:51 +0800 From: Yunsheng Lin To: , , , , CC: , , Subject: [PATCH net-next] net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc Date: Tue, 1 Sep 2020 08:55:18 +0800 Message-ID: <1598921718-79505-1-git-send-email-linyunsheng@huawei.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently there is concurrent reset and enqueue operation for the same lockless qdisc when there is no lock to synchronize the q->enqueue() in __dev_xmit_skb() with the qdisc reset operation in qdisc_deactivate() called by dev_deactivate_queue(), which may cause out-of-bounds access for priv->ring[] in hns3 driver if user has requested a smaller queue num when __dev_xmit_skb() still enqueue a skb with a larger queue_mapping after the corresponding qdisc is reset, and call hns3_nic_net_xmit() with that skb later. Avoid the above concurrent op by calling synchronize_rcu_tasks() after assigning new qdisc to dev_queue->qdisc and before calling qdisc_deactivate() to make sure skb with larger queue_mapping enqueued to old qdisc will always be reset when qdisc_deactivate() is called. Signed-off-by: Yunsheng Lin Reported-by: kernel test robot --- net/sched/sch_generic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 265a61d..6e42237 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -1160,8 +1160,13 @@ static void dev_deactivate_queue(struct net_device *dev, qdisc = rtnl_dereference(dev_queue->qdisc); if (qdisc) { - qdisc_deactivate(qdisc); rcu_assign_pointer(dev_queue->qdisc, qdisc_default); + + /* Make sure lockless qdisc enqueuing is done with the + * old qdisc in __dev_xmit_skb(). + */ + synchronize_rcu_tasks(); + qdisc_deactivate(qdisc); } }