From patchwork Thu Oct 13 17:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp410510wrs; Thu, 13 Oct 2022 11:06:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5L4oy7Z70rL0Wv4ikg9QcnO4QmxhMIneRw323dCJOUIjtKv445E2Nx3R1ZIfLdSNE8Aj6C X-Received: by 2002:a17:902:7c11:b0:178:a6ca:4850 with SMTP id x17-20020a1709027c1100b00178a6ca4850mr913310pll.111.1665684403841; Thu, 13 Oct 2022 11:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684403; cv=none; d=google.com; s=arc-20160816; b=fKHHrEDgaMeQjq0HEompUIbV0wAyQldBeq6F42kU6RgL3gGlNWyYiZM8K72AN06/56 Ln+x8SaaWDQoLV1xFuXawPIb+f4g3+yGKD5w20NXsyy6lO2iDhWQ2DTNR331875CnLQR 4dDUAYm2iQngKpdlQ7JT8xJQ2pahYYkp3FMfVuwBMNgnnBzchiDVv64lSCE0d0H2QdZ5 DI9qi9F39RdTTOLnKKwNhRyufXMkTzx+2WAoh+P2lnDqQqrGNDfPd+h7CIaAnLOmYmC8 WxiDzF2o3dsS2ffsfTDCOViIE5zQfnbXZnTi5ytUo4qWK8FcRc2CgIvN7FyJFnxeeen9 4cYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QCCAbsAsP4+IyZPMb7ZuKOQqc9HLVeJDysj1gFNUvAs=; b=pFvFqkFEH241aeZZoV9lziMKOWPvLmjRyDyQevQItD4zCVvv1nP7orKV/cZTDXEvSj ZkdJuG742Dsc6nDC3p2ltKaLxURUQBwLRUQgNfkzdP/l428rS2ZNpZ1UAgW0V970zI1r LtKwFglfvNqVwhgIcFMGTyNeL0vDKtirSs+lArlI0yi9muZKokmzS5cKROR06TRMZH9u xuTyWPqdTHmz5CztqJfwXg9zlWTrFuuGFJqNnTavOi/8LFJ8CCyz0czPyb/aBWPM0hoS EEqusaWLJ0oxX5iIyzMix4HCx8p8WXjfx5Ow4yocxXmtE/TqhUWtb7z6OFmXFV+lN4vI C3EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eOQuL1uW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u189-20020a6385c6000000b0043969d624dcsi15602pgd.675.2022.10.13.11.06.30; Thu, 13 Oct 2022 11:06:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eOQuL1uW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229963AbiJMSGN (ORCPT + 99 others); Thu, 13 Oct 2022 14:06:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231254AbiJMSDy (ORCPT ); Thu, 13 Oct 2022 14:03:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97364152C61; Thu, 13 Oct 2022 11:03:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 028AE618FB; Thu, 13 Oct 2022 17:57:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2990C433D7; Thu, 13 Oct 2022 17:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683824; bh=kjlTBAYOWOa34dX16YvBttDseq80QT08B3KsDJWTL1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOQuL1uW6QGAd+zoNjYPMZt7nK6Q17oa8SymkiQF3kZkxIkOCENQfpUiigBFhPsTS FEMdwa12GbzgygNEyxDxWguESFbRnpNgkpiq9S2Mykj88jFwW/dnQnR4TEbjTTvmPy vwKsU4ucxe42cxlMOeamrNckLGTWuRUM84rCGmJk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?S=C3=B6nke_Huster?= , Johannes Berg Subject: [PATCH 5.10 48/54] wifi: mac80211_hwsim: avoid mac80211 warning on bad rate Date: Thu, 13 Oct 2022 19:52:42 +0200 Message-Id: <20221013175148.499272954@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596689452174323?= X-GMAIL-MSGID: =?utf-8?q?1746596689452174323?= From: Johannes Berg commit 1833b6f46d7e2830251a063935ab464256defe22 upstream. If the tool on the other side (e.g. wmediumd) gets confused about the rate, we hit a warning in mac80211. Silence that by effectively duplicating the check here and dropping the frame silently (in mac80211 it's dropped with the warning). Reported-by: Sönke Huster Tested-by: Sönke Huster Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/mac80211_hwsim.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3675,6 +3675,8 @@ static int hwsim_cloned_frame_received_n rx_status.band = channel->band; rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]); + if (rx_status.rate_idx >= data2->hw->wiphy->bands[rx_status.band]->n_bitrates) + goto out; rx_status.signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]); hdr = (void *)skb->data;