From nobody Mon Feb 19 08:07:56 2024 X-Original-To: dev-commits-src-all@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 4TdZsS39Yyz5B2kQ; Mon, 19 Feb 2024 08:07:56 +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 4TdZsS1hD6z4KWB; Mon, 19 Feb 2024 08:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330076; 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=wRTw54cTTi5s0+KIFthVbf4rQWuYTd8f/8eBePPT1nE=; b=KmNfniUNfgSL5x2Ejw8vk9DWgsrz6XsN63eazkJwUyfWvFh/OKFyrU42YbS2NdShEIeHqp cWAfEcCbPLWeHuj6DGxpvjb1SQ+9ALqMMYj0Rga872ZOP6SL/oZ0nMjyfJwo67ze0Z2gWD Y6RkReaiwsqx2exloYoNvcNLVPc5FXWzCU+qHrhqMMESaZFikFPvzg1KTkLgqZumfPnc6p jZVYD5D7DqqX0AWsQSig08IEEllzOFaj/GGT6wACcos+WSXwKXOltFaSQ6TZQ9NBAtLL5P j4NGcB4XgND8gISjAssm+5WfvHT2qWOP9xF/ZdoKxrJX9iKesZzZsXQ2svMwsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330076; 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=wRTw54cTTi5s0+KIFthVbf4rQWuYTd8f/8eBePPT1nE=; b=HZ/Jztxz2IFn88iSVCBXEMrX0ZouZxxlx5L3LGA6HLB5xBSDSH2kPPHGbKvp4uvbqeu4kI 5v30ujtHe1crw4wGSq5bnwwbmrOByINz4ZRJmykUTb16sD9OBuiOErE2bL0W8XWmDC7L3y TOEk9BezfFPmu/80IpPse1+LIyhMmSfnT/tAhjrDAdo5VWGpDQp+gc7R3MniulOYseiFkp Wd9a85WDCGAJPrHKvRhnSlrJRGCPWVx2yepMIWmUQmPSSIQWWJ54YApNr0EsBG53NfnYx2 h/Ja+XIb/vdBBBoQOriNGJGt9bRebpqav6FC74Q+Rwprr7PQUfQzQjhgFa/iBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330076; a=rsa-sha256; cv=none; b=wgREU7ogtKwfEMEfOvg6mHTdHmVvK9jV6S7WBNyYZFKpXtazgUfUQ6wQkJ03bkul1Ji2Xf 6cPCS+/Q3FrZxiVsV5gYBw3zLdhUbtLqQSFCjPTXfJTn2ry9nw27HrCKMoWj6jnA0+h+Id XiMnmJp/89ainSAQXBMFDMXnWqnz5S9XVJygQOsm60dDYOchlWp8K2Y88VvOXH/rVCPUwt c89QZPIvLY5UPDqg/mLRY2W60IJ3TicFaqfJLZG/SMppnje6s1bojZ0wJ8by1ws/l3V51r cuHaI4PssJHZcpAgB+bRaBydCOPuYMaRQq5ieYyqMg+nKxMS8Mwlj4+T2DDRlA== 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 4TdZsS0m5zzRTh; Mon, 19 Feb 2024 08:07:56 +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 41J87u8P016141; Mon, 19 Feb 2024 08:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87uWF016138; Mon, 19 Feb 2024 08:07:56 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:56 GMT Message-Id: <202402190807.41J87uWF016138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 755a04671dd4 - stable/13 - net80211: fix a NULL deref in ieee80211_sta_join1() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 755a04671dd47390f6d49695a6ac9c2d31c9935c Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=755a04671dd47390f6d49695a6ac9c2d31c9935c commit 755a04671dd47390f6d49695a6ac9c2d31c9935c Author: Bjoern A. Zeeb AuthorDate: 2024-01-16 18:53:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:01 +0000 net80211: fix a NULL deref in ieee80211_sta_join1() When ieee80211_sta_join1() gets an obss without ni_nt trying to lock that will cause a NULL pointer deref. Check for the table to be valid and deal with the obss node accordingly. This can happen if sta_newstate() calls ieee80211_reset_bss() for nstate == INIT and ostate != INIT. ieee80211_reset_bss() itself calls ieee80211_node_table_reset() which calls node_reclaim() which ends up in ieee80211_del_node_nt() which does remove the node from the table and sets ni_table to NULL. That node (former iv_bss) can then be returned as obss in the (*iv_update_bss)() call in join1(). Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D43469 (cherry picked from commit 8a5a3e3d0436a2de9dc5c2c10bd9a471b6338233) --- sys/net80211/ieee80211_node.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 75795342f4b4..090c8c50c600 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -867,11 +867,14 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) struct ieee80211_node_table *nt = obss->ni_table; copy_bss(selbs, obss); - ieee80211_node_decref(obss); /* iv_bss reference */ - - IEEE80211_NODE_LOCK(nt); - node_reclaim(nt, obss); /* station table reference */ - IEEE80211_NODE_UNLOCK(nt); + if (nt != NULL) { + ieee80211_node_decref(obss); /* iv_bss reference */ + IEEE80211_NODE_LOCK(nt); + node_reclaim(nt, obss); /* station table reference */ + IEEE80211_NODE_UNLOCK(nt); + } else { + ieee80211_free_node(obss); /* iv_bss reference */ + } obss = NULL; /* NB: guard against later use */ }