From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FAA2191496; Sun, 28 Jul 2024 00:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722128054; cv=none; b=SyluVyQQnImFod55ux/xBxQwwY2B/1h2KTbdn1xDINIT4Y+w97x+eTET6AQYBRzFRnsDpcvOV/2WwUo5PYZlPOZw/XhoVgOLWUVky/N0p2O7h0RSUsUnEfmLsnrjhlKpNM+O06ZKtvDBw51dNYNtWBan5AGYu/dxfWHejX1gTgg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722128054; c=relaxed/simple; bh=dNcT6zvBsQVLj1Ly5S7urfD5j1AbpzE+00HRb5e+HVc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JNeBFLk+LOuo/adsChG1nvdeqLlzRzE7hFc7YMJdv6u6ZJjbjc5PZl8Q9/oyBi72OfwjI5ptNRsKYObBjWfquLOJ062skpcN3EYkq/lxEb1Mxb+eZdY9KEew1KdYjiBwZhIys0Ec/JqK4hxSHjPj6PhVAyceBYMEkrrosiTqFTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bcFvuPno; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bcFvuPno" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EE66C32781; Sun, 28 Jul 2024 00:54:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722128054; bh=dNcT6zvBsQVLj1Ly5S7urfD5j1AbpzE+00HRb5e+HVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcFvuPnoOa7ovg1MUznIJPnowH1GSeMf2Ab9XzKo8hMiOTtEDCW0Zmzmn8Bij97iC TRp/Tdp2JixMjML8BMg7XS0+QnVA0xlpLDsYNu7kbVAYD9g1ntpEE9pzCNX9LONTDS aGMA1LxOWaOKXlGFIXn2dd8MyWmyo44OHt8sQEDDZ7+MeSmQETwk33JuxE7njj1VTx CKCJtw6KQb8HEP/MP9u3Nd6voJBsJQDKykbbMe38HRPhra0pXmEbu4adX0F3TJUl5M 3q1sk1QiRiCX7ciqBpLdhF43lVKmsCmdyGF+G83Lg1WwXYEQBeoZMA3T26rjGp+0YI qI3w0rWuxmJ/w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Miriam Rachel Korenblit , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 16/27] wifi: nl80211: don't give key data to userspace Date: Sat, 27 Jul 2024 20:52:59 -0400 Message-ID: <20240728005329.1723272-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728005329.1723272-1-sashal@kernel.org> References: <20240728005329.1723272-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit a7e5793035792cc46a1a4b0a783655ffa897dfe9 ] When a key is requested by userspace, there's really no need to include the key data, the sequence counter is really what userspace needs in this case. The fact that it's included is just a historic quirk. Remove the key data. Reviewed-by: Miriam Rachel Korenblit Link: https://patch.msgid.link/20240627104411.b6a4f097e4ea.I7e6cc976cb9e8a80ef25a3351330f313373b4578@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 81d5bf186180f..715ecbb3689e7 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4482,10 +4482,7 @@ static void get_key_callback(void *c, struct key_params *params) struct nlattr *key; struct get_key_cookie *cookie = c; - if ((params->key && - nla_put(cookie->msg, NL80211_ATTR_KEY_DATA, - params->key_len, params->key)) || - (params->seq && + if ((params->seq && nla_put(cookie->msg, NL80211_ATTR_KEY_SEQ, params->seq_len, params->seq)) || (params->cipher && @@ -4497,10 +4494,7 @@ static void get_key_callback(void *c, struct key_params *params) if (!key) goto nla_put_failure; - if ((params->key && - nla_put(cookie->msg, NL80211_KEY_DATA, - params->key_len, params->key)) || - (params->seq && + if ((params->seq && nla_put(cookie->msg, NL80211_KEY_SEQ, params->seq_len, params->seq)) || (params->cipher && -- 2.43.0