From nobody Mon Oct 27 14:34:33 2025 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 4cwGHF74Rnz6Dlh2; Mon, 27 Oct 2025 14:34:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHF6cV8z3jKS; Mon, 27 Oct 2025 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575673; 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=KZ0KCMyZ4oClmyKf/GhTMYiDGiMuFntDXz2Vxa0FRt4=; b=H/DEgk9Bpve98GneTQv/IqaGIEFZMMUJdxReG93fKevQOSI+rcmv7iryb/Bxmj6FhrbYUg 5NgpUZqFUME28hfLC91vcxNpJCoytatkWwwPuAtRlmmEgzTmz4D2Gtbs+hE7zzqjgb0/eF dn6xIWCs0zTRXA5FlRo4RBKmtQt1mBfSIG4F+qnXIRXoAxTOLAIU5wFZKwV/YCBPI2UQCd +hJSicIRnTPoSxv9UsBwVxhiuCFAJTg/6Yrlk8wULK058dCwK8FAlTZ+RObER6PsjUZeDV pQwglXHhpDvq52XfSJgkY361jQtkIOldRNcn5HFuJ2uqyWlPmoPyLGiMDms1og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575673; 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=KZ0KCMyZ4oClmyKf/GhTMYiDGiMuFntDXz2Vxa0FRt4=; b=r7gp93++WddTqCUyxLx1W1+Ym/rY+B+rusryB3BHszTxfnMB7ICVHGSNLSspsUF6jeXYEv Gdtg3uFVZzlkdc5WqAJnYw2xmdkGnAieBavna2G9SZTSxT/7QOBCp7eo5vruAnlZuWVHzM ywtUqJXvBjXkJjSUY9z4gLlpZCx2DgASzyg1N74DtZSBIRjyntLpoKyZzSrjpkuYWZmtMn eh593MbVqno4Im7BX0uMBRjsabGsGoOljm/sqlZcbPGqJkESZfLAb7qej/peGkbc3v4YMj jWao4cANexeom9YnV3KLrdz1PGfbjQxtuJcVk+qeMzP4iRsyyyiHpbNBpzjrtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575673; a=rsa-sha256; cv=none; b=A55h73olbldgfH+vNDz6TeSFbDOiL6yIlucyj/EKWvg/MT5yHcScvSXRYoXr0YuFWYhGIX zY9StQsNBwialWUGPf4SNEf2UdZ9z9RH8rhnWiwmFhTD3ZwYiz5M6qg6dDrF5eu/NisyoR PGjn0wmNn7TR952mpYcKmZ+a3cWV3HYG2dQMEYT4NKjR+MOwRTwHO3pOAxmBS4rI4e1Vku V+aYv1tKSAJaAo2Vxn75VVsUY86MOodi3n7crx96x45QABG29ixod7SH7VPozh/iFArSFc hI0y7es3F7A/2leUH1Vxmaz9kwq6yh3i+CGPDiM829G4WvbL/03JtZgmKT+9Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwGHF6B3Zz1MPn; Mon, 27 Oct 2025 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59REYXcS063366; Mon, 27 Oct 2025 14:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYXI3063363; Mon, 27 Oct 2025 14:34:33 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:33 GMT Message-Id: <202510271434.59REYXI3063363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: cb3849930362 - main - x86/intr: Handle case of disabling MSI after release 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb38499303621553c977fd7dd7f18d12731fcd9c Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=cb38499303621553c977fd7dd7f18d12731fcd9c commit cb38499303621553c977fd7dd7f18d12731fcd9c Author: Justin Hibbits AuthorDate: 2025-10-26 02:45:26 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:49 +0000 x86/intr: Handle case of disabling MSI after release Once an interrupt source is registered it's never deregistered. However, when an MSI is released the pointer for it becomes NULLed out, resulting in a NULL pointer dereference when attempting to disable the now-released MSI source. Add NULL check to avoid this. Reviewed by: kib Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51624 --- sys/x86/x86/msi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 9d5a51f9753c..b38247bf6e45 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -219,6 +219,14 @@ msi_disable_intr(struct intsrc *isrc) struct msi_intsrc *msi = (struct msi_intsrc *)isrc; msi = msi->msi_first; + + /* + * Interrupt sources are always registered, but never unregistered. + * Handle the case where MSIs have all been unregistered. + */ + if (msi == NULL) + return; + msi->msi_enabled--; if (msi->msi_enabled == 0) { for (u_int i = 0; i < msi->msi_count; i++)