From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5F4FEC10F04 for ; Fri, 15 Feb 2019 02:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2964220643 for ; Fri, 15 Feb 2019 02:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550197247; bh=/Vdtwg9o3j2wrnyh4VlJ679PmU4FlAI8+wcvIi43YR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Am3O9m9dPMSCNV1RLhhmFiJVcaHwilUi1MISvmUsMEVO7o2yGuTdS8QC3Vx3q2b65 cV9ut/xaOhmdCOW+Uev0EOYUDfZaBiSM2sEEj2OMszc9UfOvXUqmcm09FF1nAh4QLh WmV86vvXAmZtHxicEXcc6i6WTw4t17Jyirw7skOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405536AbfBOCPM (ORCPT ); Thu, 14 Feb 2019 21:15:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:54956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390220AbfBOCPG (ORCPT ); Thu, 14 Feb 2019 21:15:06 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5DB1D21B68; Fri, 15 Feb 2019 02:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196906; bh=/Vdtwg9o3j2wrnyh4VlJ679PmU4FlAI8+wcvIi43YR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nIVyXCiS6nFRWwdb4vBvmucrqr3ZxHeqaEoB9euQpFgRv4C7WkUUz//77XH1sKvpW euDvWwYbQnjTPjZ6CXvJEPLA/CIbxRkC5aytW78MGCa55yg2vc5yMuZwKmhMOAehPM q8gzhNOcyw5+1xsQZHlZSu666SlLfZb9uXABn/Sc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Balaji Pothunoori , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 23/27] mac80211: don't initiate TDLS connection if station is not associated to AP Date: Thu, 14 Feb 2019 21:14:20 -0500 Message-Id: <20190215021424.178979-23-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021424.178979-1-sashal@kernel.org> References: <20190215021424.178979-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Balaji Pothunoori [ Upstream commit 7ed5285396c257fd4070b1e29e7b2341aae2a1ce ] Following call trace is observed while adding TDLS peer entry in driver during TDLS setup. Call Trace: [] dump_stack+0x47/0x61 [] __warn+0xe2/0x100 [] ? sta_apply_parameters+0x49f/0x550 [mac80211] [] warn_slowpath_null+0x25/0x30 [] sta_apply_parameters+0x49f/0x550 [mac80211] [] ? sta_info_alloc+0x1c2/0x450 [mac80211] [] ieee80211_add_station+0xe3/0x160 [mac80211] [] nl80211_new_station+0x273/0x420 [] genl_rcv_msg+0x219/0x3c0 [] ? genl_rcv+0x30/0x30 [] netlink_rcv_skb+0x8e/0xb0 [] genl_rcv+0x1c/0x30 [] netlink_unicast+0x13a/0x1d0 [] netlink_sendmsg+0x2d8/0x390 [] sock_sendmsg+0x2d/0x40 [] ___sys_sendmsg+0x1d9/0x1e0 Fixing this by allowing TDLS setup request only when we have completed association. Signed-off-by: Balaji Pothunoori Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/cfg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 6ef9d32c34f1..954315e1661d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1425,6 +1425,10 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) sta->sta.tdls = true; + if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION && + !sdata->u.mgd.associated) + return -EINVAL; + err = sta_apply_parameters(local, sta, params); if (err) { sta_info_free(local, sta); -- 2.19.1