From nobody Sun Jul 9 15:25:11 2023 X-Original-To: dev-commits-src-branches@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 4QzWCr0JQZz4mW8h; Sun, 9 Jul 2023 15:25:12 +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 4QzWCq70MJz4MZy; Sun, 9 Jul 2023 15:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916312; 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=WwWlqtjCRwyTl7wtwZqrTRPQURCtbbZku+Y9ylPk+tg=; b=fjuY0h21hSRVXWBMjVLDo6GytyibV2xUsFeGbOFXrqSfkmW2WHEFWwpMGEvYg6nDwu//g0 HQ9Ufz7Z7Q8wwnVRJJ7JzLneEkTkRau9MfnHMmHk0lTcNBIUItGaqnlTGdHm0lFtAnWZ8L tpt2MOJHYmnnWY4ihE6w6ZELmkv4/6nlopLbJmiv6zdq34jeTe/3URssTiqIMo6E71KmQ8 ULvOY7uFbidoBZPXjShqJ/weRTDLHJ+nOV2jqChdBqNB2zYqJV/XKrQ74Q7ksiKTTrNEfV +Vo/kUzNQM5EK0iFgQjMSd0ZX0RV6b+vY/8nE8Dmh/cVyx548aJVaYoNs0zAQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688916312; 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=WwWlqtjCRwyTl7wtwZqrTRPQURCtbbZku+Y9ylPk+tg=; b=Kl+yI6pPK0r+g6zX+LrtUoiQVjDjWiWd0p6wfVwPZN+JlbU1HiyPyJTXC744LS5ZsQvaPG puLSrEx+n3YndKdT7JiiXlRgnWSyqztejIDMOPNqiMJXqg6YF5Q9l1fOS4I1qOCHaJDJrj 6Y/fsQv1/GT+kOZ7Nur3fl7Ax0iD9EO1p6D0572VnF4r37TYIHuRfcuATDfnXbMmnJ+uKc p8f29Lf6kVj36ZJq9pkV51iI9rHlwwAONPak2ThQDPZdoKN90XUQXU2dd5wzGhcvAGU+ls tk6A2+kEZwNUyJcqRIq6aaSSoPWQtfJcrKqsEHWx11M6SpTY+xGQ8OCNodYj+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688916312; a=rsa-sha256; cv=none; b=imoBfrW+EuplLcGp8rLzkA/s0C1EReUyhmwbE3bGLIPcUYL/x3A9SB/ro26xSvOkpFXAkK YYoM4q5Gg8zl3hGcbix+44COpVbeD9lUlCTWywRmz55x1h8TFX4PUtFw41uzZNZleHi4Hr w5lHkRMlofsDe71GA4mbgvHo5p/yMZG9uoba+Ois7SLRkcn/vZ+EMEmz9aispHZSum58PQ kUDDZuPg8BDIkVeGfOP3+tq/9a47XsEWCHzDZLx5fEldoonHQAIca6+83X0iyx4fsH+4kB 1/xA9yXBABeyg1Q/WzP5fbhhd3bALh9DMJ+iuQqZzGbdECLNFJRqIe0Rjr3d3A== 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 4QzWCq5ytvz17YQ; Sun, 9 Jul 2023 15:25:11 +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 369FPBVT052808; Sun, 9 Jul 2023 15:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369FPB5P052807; Sun, 9 Jul 2023 15:25:11 GMT (envelope-from git) Date: Sun, 9 Jul 2023 15:25:11 GMT Message-Id: <202307091525.369FPB5P052807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a1784b7d8c21 - stable/13 - if_bridge: fix potential panic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1784b7d8c21ad5862c96b83cf328d1970ac72aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a1784b7d8c21ad5862c96b83cf328d1970ac72aa commit a1784b7d8c21ad5862c96b83cf328d1970ac72aa Author: Kristof Provost AuthorDate: 2023-05-18 18:04:45 +0000 Commit: Kristof Provost CommitDate: 2023-07-09 12:27:05 +0000 if_bridge: fix potential panic When a new bridge_rtnode is added it is added with a NULL brt_dst. The brt_dst is set after the entry is added. This means there's a small window where another core could also attempt to add this node, leading to the code attempting to log that the MAC addresses moved to a new interface. Aside from that being a spurious log entry it also panics, because obif is NULL (and we attempt to dereference it). Avoid this by settings brt_dst before we insert the bridge_rtnode. Assert that obif is non-NULL, as an extra precaution. Reported by: olivier@ Reviewed by: zlei@ Differential Revision: https://reviews.freebsd.org/D40147 (cherry picked from commit f3546eacf0daac55fe08b6ad5849b0e440f75ffb) --- sys/net/if_bridge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index cd2fbff3a85c..29620d5740fd 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2821,12 +2821,12 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN); brt->brt_vlan = vlan; + brt->brt_dst = bif; if ((error = bridge_rtnode_insert(sc, brt)) != 0) { uma_zfree(V_bridge_rtnode_zone, brt); BRIDGE_RT_UNLOCK(sc); return (error); } - brt->brt_dst = bif; bif->bif_addrcnt++; BRIDGE_RT_UNLOCK(sc); @@ -2834,6 +2834,8 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan, if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC && (obif = brt->brt_dst) != bif) { + MPASS(obif != NULL); + BRIDGE_RT_LOCK(sc); brt->brt_dst->bif_addrcnt--; brt->brt_dst = bif;