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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 342A1C43381 for ; Mon, 4 Mar 2019 08:34:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 048B4208E4 for ; Mon, 4 Mar 2019 08:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688491; bh=QrDak77OFiQHSLniGNkcun3J57pijpWl+PIQNQM3RmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YdeOk4xpadByjXM0vERPhQRdHdpqg0rUV325KrDwd8f4XzDXv5Aphk3PVSHtrGUiO E0XNPGBAQCDz5EiJotzu+JocXS74Me2bFPy7+VjDlOjnQgSVQNZrPsQGjzcAuOfE3e 2sOtRt5zjxnEzIpJ03UiMLWfVE4H/+F4GcED0zYA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728339AbfCDIet (ORCPT ); Mon, 4 Mar 2019 03:34:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:41726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728335AbfCDIes (ORCPT ); Mon, 4 Mar 2019 03:34:48 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 3676321019; Mon, 4 Mar 2019 08:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688487; bh=QrDak77OFiQHSLniGNkcun3J57pijpWl+PIQNQM3RmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yHRrppoPSjI37h+6q3G+mjCxRieokwlf3vpCgwOZ7sxBZ8D6UUEUfVGMgidmr2uBs NzXLQOW9uCMMjoRijYJiFcXaTxHc7xrmVhBsezMG2Yh0sEadBUfVb3xD06V9At8vAq +9Hjn165g6/41KGcajS38IKM0vcWTbk8hXfstM0Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Balaji Pothunoori , Johannes Berg , Sasha Levin Subject: [PATCH 4.20 61/88] mac80211: dont initiate TDLS connection if station is not associated to AP Date: Mon, 4 Mar 2019 09:22:44 +0100 Message-Id: <20190304081632.952808327@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081630.610632175@linuxfoundation.org> References: <20190304081630.610632175@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 517dad83c2fa7..ac8478876b864 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1494,6 +1494,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