Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1642418pxb; Mon, 22 Feb 2021 07:18:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcBibAdZlEqdyWWTDXiT+drfgz35Zorbi1LceOimzgmxBAMEiWbsnqQejHYofKxqIdfu6h X-Received: by 2002:a17:906:ad87:: with SMTP id la7mr18440945ejb.534.1614007128442; Mon, 22 Feb 2021 07:18:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614007128; cv=none; d=google.com; s=arc-20160816; b=WxcodbDKKqa3f2rFHjpKHVp7O+fePCqz9Nr6hD0clbPLpiEIjRFKl+9IEWdeJLBm4s DiW0umD2ZtO1RMgjALp0bzbGG4S4VOVaki1AmJfSjqYpYN7eChnU5lNQA6EKWTcqRXRZ OIVb47E1iI9kNOJwlKQIAgCWY1R1tPIB4Qz0HILdkoNgO6gev6o0XNTLIEsTlB2u1mzZ HVUCsvI04Tbj3ibn2rKfMzPOEbUL9zQWY+/QGRCSdaICIcmVKL5/6hyArRE15PkdtE6h OUHkFm1KVze5Dp/MOYrZneboZgHHM7MGzK+1gzxPPp4QejyleOphaTqNmFmbcenMxOhp wnNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8blVhZ8hazsWXUnD83eSkDBN5S7TINbG0ztzO+5P8SE=; b=GS/2GFbzNnRjmvbDMmhpcCxQ0/WMfRKsFc8nzb7TadTk2XJoXaprXR5vQPPG8pslS/ UywynCfGOMErghR2UW+SSX2UoOD2G9eMjakL0am1CYCCKV1dffHyHqBqYj47PMInrnsS zBtF/HGuPq+e/0ACqCJUrB0DrG9GTCOGIDf5Ca04ROGbPrw1pKNNy32ynd8gM+5fj57Y vQ4SeXYuNb11hU9Rt3yVx9tuvEuDvqcR2OebQ5SnfPxhGGfbP6l65iNkhfgNhvkHliGf mgeJgi6oINEx7ABCRQu6Jl5+lnSRM/qu/k3+JWuO0p7h3UOXeJtYLlZa/s0v3ruQJEdA 1yLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jt19si673692ejb.589.2021.02.22.07.18.25; Mon, 22 Feb 2021 07:18:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231411AbhBVPRS (ORCPT + 99 others); Mon, 22 Feb 2021 10:17:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbhBVPP2 (ORCPT ); Mon, 22 Feb 2021 10:15:28 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAEB7C0611C3 for ; Mon, 22 Feb 2021 07:12:59 -0800 (PST) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lECtF-0007dv-15; Mon, 22 Feb 2021 16:12:49 +0100 Received: from ore by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lECtE-00075k-HH; Mon, 22 Feb 2021 16:12:48 +0100 From: Oleksij Rempel To: mkl@pengutronix.de, "David S. Miller" , Jakub Kicinski , Oliver Hartkopp , Robin van der Gracht , Johannes Berg Cc: Oleksij Rempel , kernel@pengutronix.de, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , linux-wireless@vger.kernel.org Subject: [PATCH net v1 3/3] [RFC] mac80211: ieee80211_store_ack_skb(): make use of skb_clone_sk_optional() Date: Mon, 22 Feb 2021 16:12:47 +0100 Message-Id: <20210222151247.24534-4-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222151247.24534-1-o.rempel@pengutronix.de> References: <20210222151247.24534-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wireless@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This code is trying to clone the skb with optional skb->sk. But this will fail to clone the skb if socket was closed just after the skb was pushed into the networking stack. Fixes: a7528198add8 ("mac80211: support control port TX status reporting") Signed-off-by: Oleksij Rempel --- net/mac80211/tx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5d06de61047a..c0dd326db10d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2439,11 +2439,7 @@ static u16 ieee80211_store_ack_skb(struct ieee80211_local *local, struct sk_buff *ack_skb; u16 info_id = 0; - if (skb->sk) - ack_skb = skb_clone_sk(skb); - else - ack_skb = skb_clone(skb, GFP_ATOMIC); - + ack_skb = skb_clone_sk_optional(skb); if (ack_skb) { unsigned long flags; int id; -- 2.29.2