From patchwork Tue Oct 27 13:51:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 307105 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=-12.8 required=3.0 tests=BAYES_00,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 1691AC64E7A for ; Tue, 27 Oct 2020 17:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0751208B8 for ; Tue, 27 Oct 2020 17:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819888; bh=GuRof7UemjKwMckMqBGPC3r/wH0n1swkFXl7GccUEgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oVnr+lrgE/VKAV0GfKhpxWSclMzPKuXY0Zgh+LaXX9yXgoMtBtbidww+J7I65f2f8 4AxQW28X/irVrgDxzxAK74g1QIbGE2HbkZHmsq0c9CXcIiETBGYtCzPNF5rxNB6fTs LfcwFsZ5Hg1m6PC33mbJcuTmvOW4RvXjK7n3+RZ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760897AbgJ0Og6 (ORCPT ); Tue, 27 Oct 2020 10:36:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:35830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760890AbgJ0Og6 (ORCPT ); Tue, 27 Oct 2020 10:36:58 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 67BCE207BB; Tue, 27 Oct 2020 14:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809417; bh=GuRof7UemjKwMckMqBGPC3r/wH0n1swkFXl7GccUEgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSj/X6DQgpumsYINrEsmaJZA6UY7IatDo6+2zq9v1IjxhEXYTizdfTuz9cn0XQDmA xhKkv1ptFicc8OR5q5yXAVzfqqG9fQf27SAEHoR0n/radNUuWa2M0NldYYQfN2uNw1 +ZZahxrXD2Yf5EoXF59w+E1nBpje/M8oKBocN4nU= 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 181/408] nl80211: fix non-split wiphy information Date: Tue, 27 Oct 2020 14:51:59 +0100 Message-Id: <20201027135503.495262354@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg [ Upstream commit ab10c22bc3b2024f0c9eafa463899a071eac8d97 ] When dumping wiphy information, we try to split the data into many submessages, but for old userspace we still support the old mode where this doesn't happen. However, in this case we were not resetting our state correctly and dumping multiple messages for each wiphy, which would have broken such older userspace. This was broken pretty much immediately afterwards because it only worked in the original commit where non-split dumps didn't have any more data than split dumps... Fixes: fe1abafd942f ("nl80211: re-add channel width and extended capa advertising") Signed-off-by: Johannes Berg Link: https://lore.kernel.org/r/20200928130717.3e6d9c6bada2.Ie0f151a8d0d00a8e1e18f6a8c9244dd02496af67@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3faad3b147376..672b70730e898 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2227,7 +2227,10 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, * case we'll continue with more data in the next round, * but break unconditionally so unsplit data stops here. */ - state->split_start++; + if (state->split) + state->split_start++; + else + state->split_start = 0; break; case 9: if (rdev->wiphy.extended_capabilities &&