Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2183209iof; Tue, 7 Jun 2022 22:27:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDCodCgMnl9aFVCV0dj2G8JPH+dzDujf4cvKWT1kpwvOu2EeIQaEpn90tRhTYDqQx01DZI X-Received: by 2002:a05:6a00:2344:b0:51c:157f:83d5 with SMTP id j4-20020a056a00234400b0051c157f83d5mr14998245pfj.5.1654666058889; Tue, 07 Jun 2022 22:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654666058; cv=none; d=google.com; s=arc-20160816; b=kq6zV9byxIPXH4tXNyHT6Ub626KPgAUkYsNO+h5TRfDGFxrZBilMHg0/ELYL4Hj4gq WUMm5ZrR7q/hAne0Vl7pxWmrAw33Hqll4jOaZCkVnsS2xaVzvcYvqX3+n7Aj3FxT5ock xjSXQ+GjPfEF/MrZtB4bsZLycXFID3UlGeyQiuX/fDW0QOpYP6Od69BZWbrzON/0Hikx HQzzoF74s6znO/yAYGpbslUMOr5skOtcr3MC3tK+PZX56TjsVgab34AML7zgUHwFLnyv 6BhvoIJofbhTif1jaeRdrF6KpdZ6ytfV2HpPGjRpZg5zUtqKTl/Kj9axK+P/jWGyLA6Y R3nA== 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=8idDUzgcGPT8szb0urCeuRcUrNFHu82H5JFrgGtQCnE=; b=wP4muoQEiAH5BO14xDybcV0up5j0xBNWcUreXTD/41DZxFaHgBSURuxbE7MRxkVeIs AuVX4U3O1vSUguxOlE32u3oOyFMuAzN9m3bBrM4TnSu2WUEZU56M5bOk0RMFegcrlQLl D5RQNMKCpeIo2f/y2NqRY8pHSgaSH0OFX9XkeuJYSBgyBuwzdyQfS2MRHX5zKeQvSqaY 2vC3EPpE7is3S+aV2uau5yq94hrb3GZYhPaWDT+1BdHu8I7h9c4jy0eJ8PxMCWrw4QYR Nrtaga7Ax/4cebs8H0zj4vb4d408OLMuIf2kW2DvmHncwhtawyW6xPGnNTmQDslPVeKg qfAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WzNh28gx; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id w2-20020a170902e88200b0015f179cded2si29229829plg.118.2022.06.07.22.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:27:38 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WzNh28gx; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A1984480DE0; Tue, 7 Jun 2022 21:55:55 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385638AbiFGWbn (ORCPT + 99 others); Tue, 7 Jun 2022 18:31:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378121AbiFGVTQ (ORCPT ); Tue, 7 Jun 2022 17:19:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90B12224D00; Tue, 7 Jun 2022 11:59:37 -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 DA21D61794; Tue, 7 Jun 2022 18:59:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4DECC385A2; Tue, 7 Jun 2022 18:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628355; bh=VAviqKYGftzlRyzmZRvF+4cD8P+ChbWou2Y1iRyuJ3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzNh28gxGQ6+8zDDFbt/NHEQNU3z4x7wMnHkRHix2XPCNzMsnOH5Yze5SKvDpDCcA ZXi5gEPCOtkboQ86usRPTmRFXLO25kPpPFP5K/lxgfncHAvoBRR64/K7tRxwn8N2/L Yw0N4OE3JP6/gUeA25iunU4HttwTr28+DSdo8hWM= 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.18 300/879] nl80211: show SSID for P2P_GO interfaces Date: Tue, 7 Jun 2022 18:56:58 +0200 Message-Id: <20220607165011.555342951@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@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=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 1a3551b6d18b..02a29052e41d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3719,6 +3719,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