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=unavailable 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 10AF0C432C0 for ; Fri, 22 Nov 2019 11:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2B522070E for ; Fri, 22 Nov 2019 11:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421155; bh=Won7SlOQeI+Zv/jE+G+dXFjBkqoZGFbtpIQEj4ENMVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JF6dwbgEKdDQBUMnWP1O34mLv5fW+JzcU4JFvE3kYybRe5bBegkHe1Ty8VhLgoj3S TOaAOgYzcRFgs3LCmzWKjiwCYo/BfJUhUWoHMkacMPSSXvsKe44OR/Y3tE8Fc0vSjg rLCinWJSd4SovmwT+DuvLfSqAfa0Uq9cF76lJv8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730080AbfKVK5r (ORCPT ); Fri, 22 Nov 2019 05:57:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:46870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730471AbfKVK5q (ORCPT ); Fri, 22 Nov 2019 05:57:46 -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 0E00220718; Fri, 22 Nov 2019 10:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420265; bh=Won7SlOQeI+Zv/jE+G+dXFjBkqoZGFbtpIQEj4ENMVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=taJeLzOHdrZkxUgdKmqr4tDqHIb9KmH4n5b8QUzgoEC6l/sNJ6co156EF4x9FfE7H yh1taJySgsTCRnnXrznuIhN3gXc6ZudfXM+kz0qyvjqUkjq6i8Dtq0EGgT3opQwReW DbcPJftEHonATHr3uSLiJ2Gpoe8TwqhYR+vsykjA= 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.19 048/220] nl80211: Fix a GET_KEY reply attribute Date: Fri, 22 Nov 2019 11:26:53 +0100 Message-Id: <20191122100915.667442952@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@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 2ef1f56504cbb..5075fd293febb 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3396,7 +3396,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