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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 03522C432C3 for ; Fri, 22 Nov 2019 10:53:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D02E42082F for ; Fri, 22 Nov 2019 10:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420003; bh=N/YrXusPb2G9RCgcBFHvHfCVYPhvcbkrrCUUliW9ALo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZbSqhrb6TPQxR/mp7re/SVcXRf5ulSnVQ/id/2IiVEkHUuJR4qMqM279l79SBvqgS 51QribqR+7LYMVN4JiqBiv1V/L+f19TyD4lx5OJpKFocxDMfZroAZlREhZ5tdppY/Y wLc8+Q/fBUp3s1LyOPg+SzeLXUhIoThBBdh0ve08= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729973AbfKVKxX (ORCPT ); Fri, 22 Nov 2019 05:53:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:37802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729794AbfKVKxW (ORCPT ); Fri, 22 Nov 2019 05:53:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 69BF320715; Fri, 22 Nov 2019 10:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420000; bh=N/YrXusPb2G9RCgcBFHvHfCVYPhvcbkrrCUUliW9ALo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dh98OHZF3W0rGlnhGj5mzZeZIJ+hbFG0XYGlfM26ZKUfMxQxWwN32DYsDKVDVobFi 5XrJMZLknRLBteahjgggNw/whyLq1RRa+vgRFZBuyu8PFX/vl1vdS6PZIqS6K6psXS pmSig8CLObH5JESljYJWQtDpx0vO1dyGspy3RL1s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Zaborowski , Johannes Berg , Sasha Levin Subject: [PATCH 4.14 027/122] nl80211: Fix a GET_KEY reply attribute Date: Fri, 22 Nov 2019 11:28:00 +0100 Message-Id: <20191122100743.004853269@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100722.177052205@linuxfoundation.org> References: <20191122100722.177052205@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Andrew Zaborowski [ Upstream commit efdfce7270de85a8706d1ea051bef3a7486809ff ] Use the NL80211_KEY_IDX attribute inside the NL80211_ATTR_KEY in NL80211_CMD_GET_KEY responses to comply with nl80211_key_policy. This is unlikely to affect existing userspace. Signed-off-by: Andrew Zaborowski Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 9627c52c3f937..df8c5312f26ad 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3118,7 +3118,7 @@ static void get_key_callback(void *c, struct key_params *params) params->cipher))) goto nla_put_failure; - if (nla_put_u8(cookie->msg, NL80211_ATTR_KEY_IDX, cookie->idx)) + if (nla_put_u8(cookie->msg, NL80211_KEY_IDX, cookie->idx)) goto nla_put_failure; nla_nest_end(cookie->msg, key); -- 2.20.1