From patchwork Thu Apr 4 10:52:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 1919739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=zGjdUife; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nbd.name header.i=@nbd.name header.a=rsa-sha256 header.s=20160729 header.b=UaDnogoh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V9JNy4NM1z1yYn for ; Thu, 4 Apr 2024 21:52:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2FBlGZTpcQEHNJN2B8WRRFx8KFVbcyPMpyt0CAgp/Us=; b=zGjdUifextH7io /2SUQV0mlnsjUHgdZcI3vxdCyGQ2XIU3/ow03BVxbY4r1PFhzCMxjcyfnkXoYlKtwKAC8tCayHGIm X7LbbQFFjR1RBhZ4uKIAT1pR/oqjiiPPbMkfxZz3J0L17omjJcTXAp8QrxpgNCPu1iek3pzd4UMP1 7Pga5myKZv2e6ZhU5mrLXOHCuNIdoJuYEWDsmTE89+AbR529GHy4nF1AvMknV4EmzrQSNJDaNICcR ljG8H4dZBgIW3yLrzAG+o3MOpNF67CKMMJj0fHZonuKMbxzjksuR1wnGXZLJGUCOEO4T2613t39Rb UqXGO1QNtC+xAdcEjvWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsKho-00000002FJi-2a32; Thu, 04 Apr 2024 10:52:28 +0000 Received: from nbd.name ([46.4.11.11]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsKhg-00000002FGd-3SOq for hostap@lists.infradead.org; Thu, 04 Apr 2024 10:52:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=HSGHQacIu9GPQKZvp5XuCNmvdpILg91XLm42Epm7P/0=; b=UaDnogohg8m2c0DgESkjMwCt21 mVxLLmwo0ecVnY1bTiLQV8U5hAdGAwMFC+9iCRuR488LI+HPBFlnkD1a0cUmsvZwW+hzvxyL5MMD6 PdZzWRpgz0kStO0luq8gtETmgcxyzS3DBnC9yfcWSD7cv/8Amqq/yJDTp+8cSD4hgm8o=; Received: from p54ae9c93.dip0.t-ipconnect.de ([84.174.156.147] helo=localhost.localdomain) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.94.2) (envelope-from ) id 1rsKhe-00CyWX-E1 for hostap@lists.infradead.org; Thu, 04 Apr 2024 12:52:18 +0200 From: Felix Fietkau To: hostap@lists.infradead.org Subject: [PATCH 2/7] hostapd: cancel channel_list_update_timeout in hostapd_cleanup_iface_partial Date: Thu, 4 Apr 2024 12:52:12 +0200 Message-ID: <20240404105217.12478-2-nbd@nbd.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240404105217.12478-1-nbd@nbd.name> References: <20240404105217.12478-1-nbd@nbd.name> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240404_035220_928182_D8626428 X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Fixes a crash when disabling an interface during channel list update Signed-off-by: Felix Fietkau --- src/ap/hostapd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index f8cb6432d007..7ea65d654db3 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -685,6 +685,7 @@ static void sta_track_deinit(struct hostapd_i [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fixes a crash when disabling an interface during channel list update Signed-off-by: Felix Fietkau --- src/ap/hostapd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index f8cb6432d007..7ea65d654db3 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -685,6 +685,7 @@ static void sta_track_deinit(struct hostapd_iface *iface) void hostapd_cleanup_iface_partial(struct hostapd_iface *iface) { wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface); + eloop_cancel_timeout(channel_list_update_timeout, iface, NULL); #ifdef NEED_AP_MLME hostapd_stop_setup_timers(iface); #endif /* NEED_AP_MLME */ @@ -714,7 +715,6 @@ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface) static void hostapd_cleanup_iface(struct hostapd_iface *iface) { wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface); - eloop_cancel_timeout(channel_list_update_timeout, iface, NULL); eloop_cancel_timeout(hostapd_interface_setup_failure_handler, iface, NULL);