From nobody Fri Feb 9 19:57:07 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 4TWl4M6T1zz5BFQT; Fri, 9 Feb 2024 19:57:07 +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 4TWl4M5wPCz4tLT; Fri, 9 Feb 2024 19:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707508627; 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=S99A87N8ch8RXnhMPOnvZcQm1LAFqiRcWd7GLiWpKcM=; b=PYXGkJvGJ/uSE1uN+mvS44zL0QBiujCzc5vHQGO2gKcMw93q3WJb4foreG16trz9xjlbmw PVtG+UFQNsDxsSmaLWwabJoQcNpcdkMVR+Bpaomv+W1HBtLGcsmqenkzRezSE9Wm5ox/nW dGWh4P0J4Ie9y0jBo/B/q+K0ODYE135VL3Pk5/bvJuCJyFVBluP834S9aLssFeFLWFdo4V iFr2KWew+TWLwHZRTpdCI1QdY5fMQvnwe8xndHiVIISe7LWFZbjdiE2ORWkQ9MZC8tvj6A H1gG572X8bCGK08GvG+ozeJWzX6LKncB4rOdj0ASP41AlL/hTMw+dRc928oLfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707508627; 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=S99A87N8ch8RXnhMPOnvZcQm1LAFqiRcWd7GLiWpKcM=; b=uD+kvMvh9DDnX4H7qVOopZ8FOraD1cMXPB7nXAZD2hf1hDeGZFKJZSjAyIQZgEL0HSZqPp Z5aYUCgSBz0XklOdrHUZCF/CQS9BmdgRY0kC5BrzR1+QTmWa9f2wnaFPdde3bjVQgl31yw brq7tBMefO5gmH+hSfP0n3CmqAOCvE/QzxyPxXQ92uEbLeaDZR2ofYxYr3wbdjhjHzCL+L y8CsSoxU0/o0HNQNAO2ig8wdfvO39TfcSjmouL9ThpjKamKg/oxK0sHtQe8pCvL6Um+mNk cJqKr8JM8/QqO9WqAUs1G1L2DPHDpytQ5maj7QMj26lDAraeYXJ3J4wiXjYBWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707508627; a=rsa-sha256; cv=none; b=kzqbIRIUMCewDB3PISqvQyixz1ePAJU9bkUDCyscoQSKSb6/ptu4YGC4e5COW08aWzYDPU yksyo/VlRp7qsQ0sdGaiI0q2OiwJ76SBkZtZDiwmjVrSu+SMDaSE0THfGzBMKL5r4DcARR CP1coh9AZAOWSsYEojuISOy4nr1DYgHYbGGYHVi5MTXoHN5eDhH8U45e96sidZeCj7mhH1 sZ2vAfq5HsqujlmOys0sxg2w/ATjIRLj1JfnZLWeFxQeRI2KoOr2Tpn+mFJjgLCXTQH66n oYJvKGmL4VqFBxlFDMdbywxlCnnr+auQsAEOpvaapVzGKzY5yPq0NX/BlEqeJw== 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 4TWl4M4z60zmXq; Fri, 9 Feb 2024 19:57:07 +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 419Jv71t072530; Fri, 9 Feb 2024 19:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419Jv7tl072527; Fri, 9 Feb 2024 19:57:07 GMT (envelope-from git) Date: Fri, 9 Feb 2024 19:57:07 GMT Message-Id: <202402091957.419Jv7tl072527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eb86c6c5b462 - main - cam: Check if cam_simq_alloc fails for the xpt bus during module init 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb86c6c5b462c996e44c45ba496937b75ef22da3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb86c6c5b462c996e44c45ba496937b75ef22da3 commit eb86c6c5b462c996e44c45ba496937b75ef22da3 Author: John Baldwin AuthorDate: 2024-02-09 19:53:43 +0000 Commit: John Baldwin CommitDate: 2024-02-09 19:53:43 +0000 cam: Check if cam_simq_alloc fails for the xpt bus during module init This is very unlikely to fail (and if it does, CAM isn't going to work regardless), but fail with an error rather than a gauranteed panic via NULL pointer dereference. PR: 276770 Reported by: Qiushi --- sys/cam/cam_xpt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 2acb106b087c..68aa6faae9a3 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -908,6 +908,8 @@ xpt_init(void *dummy) * perform other XPT functions. */ devq = cam_simq_alloc(16); + if (devq == NULL) + return (ENOMEM); xpt_sim = cam_sim_alloc(xptaction, xptpoll, "xpt",