From patchwork Tue Oct 27 13:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312516 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=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 DF114C83863 for ; Tue, 27 Oct 2020 15:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C31722400 for ; Tue, 27 Oct 2020 15:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813455; bh=YpWGTTIwvFUYP5w7Xm8K3HM1QrhDWg7yjzzTOGyeXlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EJAJmzFFOKaxBG2+dhvwEjTBUR/tl9wBKYjaeMLg2LYek65rBmh5Hh719J9/oXbxg Guq/dZpyHUQW+rJfRgqn0pCUU0i74wopEvXIEU7xgdTzyQdbPcJUml/ZwsZO6h0f6/ LhqJNtSWyrZlnAfR+XIfjg4X/J/oU1p3D2yzFNi4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1800307AbgJ0Pnq (ORCPT ); Tue, 27 Oct 2020 11:43:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:53554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1800135AbgJ0PfI (ORCPT ); Tue, 27 Oct 2020 11:35:08 -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 E3FBF2225E; Tue, 27 Oct 2020 15:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812907; bh=YpWGTTIwvFUYP5w7Xm8K3HM1QrhDWg7yjzzTOGyeXlc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qUc0Q6QG0IyX2+fdNt+eLNEKWDEMNnkorP4JDCdGp9X0mY2hcauaP4OJpN5W689WW 3/TkDwVinNtfmVVOUjbxHUF1SlgiGxJt1CYJ5xIJqEF4IQC/mglPYXSINNLfXyljvN t8TzxslC/9XMfS/TV0/4c+TN/mS5hRFQ2LttvyoE= 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.9 370/757] nl80211: fix non-split wiphy information Date: Tue, 27 Oct 2020 14:50:20 +0100 Message-Id: <20201027135507.929552260@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@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 764151e89d0e9..e14307f2bddcc 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2355,7 +2355,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 &&