From nobody Mon Apr 15 17:40:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJDwP0bMnz5H1j8; Mon, 15 Apr 2024 17:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJDwP021qz4DSH; Mon, 15 Apr 2024 17:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713202837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EOrAsYPVeS8ZyZBY/7dIyWQ9XA34QPeSAZR4VlNqh4=; b=YKJ0EVpTgMvaHWMiGso2kzzLha3bz5CQnEyVPwGIubVbABbaW7lQI+9UmKXxFuriXML77Q wwjO4lXJiYpDOnwcHbuSjDPRu2n/GxItR+Lh5vygN3cpsZzLJcTHd+ElBt3AezN2ZMMHru nMGm011qkcE86XjSuiXkgBFPi3GnbvsdkKP5QhxIhyzFfS7RRz/jbfIYRNcrr4xFR13+Tv 6wINMarH2nLC1Uw4WhMvvvTEEeN4HcyILWHDEzYqfeEarZa6OA6WxA7qIH1h/TLx3CChLC dUXqKjU8DvMY44KD2dSXoNrvVm1KgjBDMQFF5+DqbPGhE0K98Kc4td/Gq7LQ7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713202837; a=rsa-sha256; cv=none; b=lBUdGYPmkqeP1Vn9/FHj4rD0Rpyu3nJMquqwo1wckf3ry96F+C71BAwSLeOn4mvKOSJksW MHEXvx/7JiWi6DA0mBB3NDr3GMDIGI/Ds9Ypp0xJlmYHiOat5mPL8cN6aMZ8qOruxj4XIy 3vFmppHRswPszjRzzUvSh6t2kZqeHIr9r0xs0FdxQMw7GqNAmfAoUsxRrqd1DpaXEgm4NG 7UgQnJOM4lc9EftikynZPqHjEMyOD4CnXV4DEHNn7F0sKf9sSNrx6NUGKV9XHJUOGuV1Bl W04eQnjRJ+dwqSoxTTGgdwUjWRHxKydo+Xn6U2FPpJWyqKysWw/acSp4UOpyfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713202837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EOrAsYPVeS8ZyZBY/7dIyWQ9XA34QPeSAZR4VlNqh4=; b=L+dUVIkC8fEbA4UJ5aIVdf05+felqRtl/aVx7OGJHmT6laMt/TKkD0VLhi92Ot6q4RzjGA RjcgAGC48XtdMPQLQ2DhGQKUYMJjq5dR9kvy9JdNc1PQR68yi0QvLzd2SKh9rIXtaVYLyJ ZDdSmJ4OYNRHNhNevrSM/oMy3KgdzpKKPrsNrQU2yqAcVDewe5rq1Xix6PeRdB0DKvvOrr HSUNvDQqqHsTq3uOzdG7n+v8Enw4iWlRObFgaNeDDMjj3bPJkyH5gTdPbVk2Gw5iYwEgaA b1YUL+VeN6Yt87Zu4kXhMvStyJUxRFD+zXIOZHH9cEYtruM18dIKTaDPEF9XsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJDwN6l6Fz17y9; Mon, 15 Apr 2024 17:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FHea8i034572; Mon, 15 Apr 2024 17:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FHea8K034569; Mon, 15 Apr 2024 17:40:36 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:40:36 GMT Message-Id: <202404151740.43FHea8K034569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cd9fee3d2c37 - main - net80211: amrr_init: change order of commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd9fee3d2c370e81109505c2abfd381af952e9b3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9fee3d2c370e81109505c2abfd381af952e9b3 commit cd9fee3d2c370e81109505c2abfd381af952e9b3 Author: Bjoern A. Zeeb AuthorDate: 2024-02-05 14:48:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:32:28 +0000 net80211: amrr_init: change order of commands First run the KASSERT before trying to do the free operation. Better for reporting and debugging. Add a guard setting the value to NULL afterwards. NULL pointers are a lot easier to test for. MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43751 --- sys/net80211/ieee80211_amrr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c index 7248af0edccf..461554d75ea1 100644 --- a/sys/net80211/ieee80211_amrr.c +++ b/sys/net80211/ieee80211_amrr.c @@ -132,8 +132,9 @@ amrr_init(struct ieee80211vap *vap) static void amrr_deinit(struct ieee80211vap *vap) { - IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); KASSERT(nrefs > 0, ("imbalanced attach/detach")); + IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); + vap->iv_rs = NULL; /* guard */ nrefs--; /* XXX locking */ }