Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp584577iog; Mon, 13 Jun 2022 08:36:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUfDvafCBYhJaXnwMfexKmbPuWRmhTqHyAmmCi7AXoOIgI9jXD/iMVO3+Ty0aYCctX5peX X-Received: by 2002:a17:906:d550:b0:704:ae79:7db1 with SMTP id cr16-20020a170906d55000b00704ae797db1mr390531ejc.478.1655134564565; Mon, 13 Jun 2022 08:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655134564; cv=none; d=google.com; s=arc-20160816; b=OlMdrlGIA7vTNJ/4QNmqCkaeuzxk2grUxVop9lG7xiso/cpef28joBuq+HpYlvbk59 1AjBORslFJD/gXvn+z5GmD6hfc6rxBvUkHtwCrK/LdoxVc3NhzvUCxWqn6oVvsYaRsL3 WptM0N4WHGBuD33K9hpKFR38d5KEEeJE8qs8CIixcYc+FaVB+Zm119OnN+KzyhhEKcyy F6+T5MKid/Z0K5wmSYfvqBuVRfz0WDCRP/YeVR+InMYPqsLKUj1SE9qTIrmg0UT9Ii8b vNLNdHBZvAkn7xZG5hjKOW0Pq83bvn8B0AaRcntRKQN2SRPMvCt+9PA/48qcr8eGTs2z iQfQ== 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=j6RRwEuyS0oTHZSjtLUbSrv6xeKJGadJITYDS743cs4=; b=mysLJNp0SKy28vOvd0BqsBc4d++UM+vlYJp+RntcaPhRBWFkCjKyfLymAn9I4t0C1x geUYgBpu/6VVUcGdBHQXfps+o//Mr2KOEb7zHTP8k1sL2ZR3/05VSXsFMP048htCxufr 5kVpOD785ccJLqFY7SH3uOW9eGHBJiDXECe0OK36TFMqYJBrx69FbHr+NuZhtWHbWjjt byrGUWvVKZnrne+yrbRyLj7P6hWSGAtw18eG55dAnMsxD1FWMtavKv1rrRzjv+o36MhP 8maCKZpcbPE6/IDSZOzg9bx36MJqfg6/MfJPX31NjaHMeTQ0zXwOO/IBDl7201j0xRjk j1Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="ZyZKVBj/"; 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 bd1-20020a056402206100b0042e8f7fc1c8si6617963edb.550.2022.06.13.08.35.39; Mon, 13 Jun 2022 08:36:04 -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="ZyZKVBj/"; 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 S1352127AbiFMLKr (ORCPT + 99 others); Mon, 13 Jun 2022 07:10:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351881AbiFMLFL (ORCPT ); Mon, 13 Jun 2022 07:05:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CFF127FED; Mon, 13 Jun 2022 03:34:28 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 1D21B60FFD; Mon, 13 Jun 2022 10:34:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3AAAC34114; Mon, 13 Jun 2022 10:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655116467; bh=Ce7/FlVG2OBXdAX/jjQ4D4Z17J2tl1rW4UQz8EGNfcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZyZKVBj/fj1WMp9LZwIaXM8XLv+ovYKXoA4ack1Yx3UyYwD7wzEc03FPlPCucBMe/ kbhE6fkoBqlpDa0ez5U8wt4RttXEStrDw8FjkbJ7K0EFlmwHfnWhTtm4YPuTdWuz0B /OiLbTMMImPBMGsrkvGv++nUdzzIWsyYo8Dbpc98= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Sasha Levin Subject: [PATCH 5.4 091/411] nl80211: show SSID for P2P_GO interfaces Date: Mon, 13 Jun 2022 12:06:04 +0200 Message-Id: <20220613094931.411219178@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094928.482772422@linuxfoundation.org> References: <20220613094928.482772422@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 d3e2b97d5d05..8459f5b6002e 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3240,6 +3240,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