Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp591907iog; Mon, 13 Jun 2022 08:45:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynZ3GMm89Bv/0XOzf2p01fKLigjGXtxXoZbWMmQoxvQhWXdoWhHpwVHWk4qdIdKzikCfXn X-Received: by 2002:a17:907:1b07:b0:6fe:2cbc:15c5 with SMTP id mp7-20020a1709071b0700b006fe2cbc15c5mr373835ejc.677.1655135122637; Mon, 13 Jun 2022 08:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655135122; cv=none; d=google.com; s=arc-20160816; b=oqfwkB8Q3Ge36YyYNJ3w05UtNkamWRrc+lT2LaWJC/UbrgthGKjivqipzthYtOIxWk YFM5mrSRnLNVsMUom6zcVhkZg3CZycaMZoFk3t16adDHchnSyCJHG5uuHk4Myi+MYNFl m73Hpg56nkLBj10ooQxSz4wiUn5qmRfFRc8GLjuH63kX4llxDvh2YP3SQEEJsLKn0aND yg9Q8D5RXcc6L5lGsdzeXASY3A1Ehhh+Vg0s/lMMpIiqNLpK/z2RX8U9BKJ8p0nAz2iG 3vSD0o7fHU8Duk2jzRVTO69NZOqZdDcTXVBoW5zphEDzHO5T8d5uGqlp/unP+rB8URgo TxLA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=POtkCFngH9nAfdcEwHeS4dP7LQKgqnzmeNVg2p43pJA=; b=Oa3IPYfjjOotMSfhlNdLiwJHk011kfz7Ht+Or2ObWN2tAsOSu+47BYSNa0jfrHHw1c Qvqk8O+4gjNaIo0uNE6fTb5Krr1Z+oA3vSS+wTRxbvrX+0HK0uzk0uMgH97FNAVr+yrR jJaQN7gLHVR6H97AaeYyhzQcQDLYLBOwwHcbqKv4r463WBcPilB8LyWUYrgrRH4nGowu 4SZ+2aeAaPnC1IA8fniK2IfWattg2YdBZZ1ugVQf5+5uBCERAtl/Z3hLERZo5yutDzlP Gs7sUzAj7xKRVldhg2bTJ4dDd9Y4S/5VYqUaIigV2S46cc0zIXPo9Vj00NJT9UsSYJhB eLdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UmgxQUC6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e19-20020a17090658d300b00711caa783f0si8741826ejs.657.2022.06.13.08.44.57; Mon, 13 Jun 2022 08:45:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UmgxQUC6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357226AbiFMLxf (ORCPT + 99 others); Mon, 13 Jun 2022 07:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356649AbiFMLtX (ORCPT ); Mon, 13 Jun 2022 07:49:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8262E4CD6E; Mon, 13 Jun 2022 03:53:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 17057B80E92; Mon, 13 Jun 2022 10:53:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67A50C34114; Mon, 13 Jun 2022 10:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655117590; bh=3TpWI1KdoN8i7CxcBm0R+0xZDhLuJMO/7QjZY2GbSkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UmgxQUC6okVSk6cCNPjZW0mH+cTEYl6BKekwN7juMdKQf0Nbjsscj0pTMyUrZ8YBS Ex1RnIxdFBrCRy3nw3YhYcRz56OOHHVNEhKKjnKuAt5yO5C201UG8b2BLC4AI6AdCu 1ZuRKRuJD1ZBgStiVf9RyFptN+vquqWgmUpCaiBQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Sasha Levin Subject: [PATCH 4.19 067/287] nl80211: show SSID for P2P_GO interfaces Date: Mon, 13 Jun 2022 12:08:11 +0200 Message-Id: <20220613094925.902247184@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094923.832156175@linuxfoundation.org> References: <20220613094923.832156175@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit a75971bc2b8453630e9f85e0beaa4da8db8277a3 ] There's no real reason not to send the SSID to userspace when it requests information about P2P_GO, it is, in that respect, exactly the same as AP interfaces. Fix that. Fixes: 44905265bc15 ("nl80211: don't expose wdev->ssid for most interfaces") Signed-off-by: Johannes Berg Link: https://lore.kernel.org/r/20220318134656.14354ae223f0.Ia25e85a512281b92e1645d4160766a4b1a471597@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2799ff117f5a..534f57363f4a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2885,6 +2885,7 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag wdev_lock(wdev); switch (wdev->iftype) { case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_P2P_GO: if (wdev->ssid_len && nla_put(msg, NL80211_ATTR_SSID, wdev->ssid_len, wdev->ssid)) goto nla_put_failure_locked; -- 2.35.1