From patchwork Tue Sep 29 10:58:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 262973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E3D4C47425 for ; Tue, 29 Sep 2020 12:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C601F2083B for ; Tue, 29 Sep 2020 12:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382585; bh=lQcexyaZjXVoeH73AvKNhcfC2KEiQeqKqtVo1iyGMso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Mlar/v1zWfKuCgHzsneCy2OpGtF6T7t75ewVZ8B+MLKVYcW7QV1igdmnAnkj+GLY8 pPu9421gDOSc1yoaTZFJOr3Jn2zCXh3gmWkvbIZCBFSt++CvPpccOUKovFrvfXw4Ln xYHefU3YRhzHWsxvwy2olxYvj2kkXnrbUGztOgr0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730223AbgI2M3Y (ORCPT ); Tue, 29 Sep 2020 08:29:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:45188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729117AbgI2Lbg (ORCPT ); Tue, 29 Sep 2020 07:31:36 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5FA0623B16; Tue, 29 Sep 2020 11:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378706; bh=lQcexyaZjXVoeH73AvKNhcfC2KEiQeqKqtVo1iyGMso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=opiBIhKzzM53gMRd2oW8vwIXpPbau4Y+bxyOFPCzIzP1tKLmVlULh2kQoKI4A5sfO oi9aY7nR9sTDGM4pZYRMoN2qjCdZ4uRy9bLHC0MAeEtmdu2dSZ252e3wZJJfKPlwBt Y6PlwM7tswlcjl5aHSC1GujSX2toBCEpN7o/DO6A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Sasha Levin Subject: [PATCH 4.19 080/245] mt76: clear skb pointers from rx aggregation reorder buffer during cleanup Date: Tue, 29 Sep 2020 12:58:51 +0200 Message-Id: <20200929105950.894439987@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Felix Fietkau [ Upstream commit 9379df2fd9234e3b67a23101c2370c99f6af6d77 ] During the cleanup of the aggregation session, a rx handler (or release timer) on another CPU might still hold a pointer to the reorder buffer and could attempt to release some packets. Clearing pointers during cleanup avoids a theoretical use-after-free bug here. Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/agg-rx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c index d44d57e6eb27a..97df6b3a472b1 100644 --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c @@ -278,6 +278,7 @@ static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid) if (!skb) continue; + tid->reorder_buf[i] = NULL; tid->nframes--; dev_kfree_skb(skb); }