From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B0124315A; Mon, 23 Jun 2025 21:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714963; cv=none; b=VVMwh64lMZrPo6brkqX+C03HjsyRnkFbFkcKX9M5z9JSN8P0J2KYphNjKedW5BvMWx1epWFAGRsqu7fTw21zLCQv2tVvgHhLZ0PXTL7R+juxi3q5TmCksK9xy1Vy3iSziexc7rXOi1UoU/fUg4PP739lrVlQm4cN1wEhvC6ZbHU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714963; c=relaxed/simple; bh=7Raqfa5AgVY1OMgTghQK9Mkl96cDzIBGJ+jJOYKILFE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A+TVCKpcXH56nQtHEl6PsPGR+JWoZ7w3LIm9bV6Pi3t7wwWNm6CGAJuVedgMwEuXorc7LX1xzr3/g85wSeruUVjblH1VOZuIlMa90IzQCQ6yMhjplrcUvoOYzfqrPZbOyGdUMyPfO7B4Q7tqVXIodFFHwHmsjAI24kSrp0tCHqA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SPT2Mm8A; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SPT2Mm8A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D92E2C4CEEA; Mon, 23 Jun 2025 21:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714963; bh=7Raqfa5AgVY1OMgTghQK9Mkl96cDzIBGJ+jJOYKILFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SPT2Mm8AeVsAkqo1UdhAEQtb0pFAghvHSr0+AuChZt7TsUNRnLQfyJV7F5O9BbNU2 SWeswP0AtfLUxoREtU+ZsH97pP7R/7TanwvuRAZVLUk45TEfUU0zzBTpfIjy1JDFnS lk8DLdTvciG9O4GjfECXaMJwRFnBfWVWnoja9+O8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+064815c6cd721082a52a@syzkaller.appspotmail.com, Edward Adam Davis , Johannes Berg , Sasha Levin Subject: [PATCH 6.6 171/290] wifi: mac80211_hwsim: Prevent tsf from setting if beacon is disabled Date: Mon, 23 Jun 2025 15:07:12 +0200 Message-ID: <20250623130632.035297116@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130626.910356556@linuxfoundation.org> References: <20250623130626.910356556@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Edward Adam Davis [ Upstream commit c575f5374be7a5c4be4acb9fe6be3a4669d94674 ] Setting tsf is meaningless if beacon is disabled, so check that beacon is enabled before setting tsf. Reported-by: syzbot+064815c6cd721082a52a@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=064815c6cd721082a52a Tested-by: syzbot+064815c6cd721082a52a@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis Link: https://patch.msgid.link/tencent_3609AC2EFAAED68CA5A7E3C6D212D1C67806@qq.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/virtual/mac80211_hwsim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c index d86a1bd7aab08..f5f48f7e6d26e 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim.c +++ b/drivers/net/wireless/virtual/mac80211_hwsim.c @@ -1201,6 +1201,11 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw, /* MLD not supported here */ u32 bcn_int = data->link_data[0].beacon_int; u64 delta = abs(tsf - now); + struct ieee80211_bss_conf *conf; + + conf = link_conf_dereference_protected(vif, data->link_data[0].link_id); + if (conf && !conf->enable_beacon) + return; /* adjust after beaconing with new timestamp at old TBTT */ if (tsf > now) { -- 2.39.5