From nobody Mon Apr 08 20:25:51 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 4VD0wJ01Hcz5HhqJ; Mon, 8 Apr 2024 20:25:52 +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 4VD0wH5p2kz3y0s; Mon, 8 Apr 2024 20:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712607951; 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=rrF481fEdBwv1CFeOVj8D8hEyzToCXORAbo80ZD5HKA=; b=nf4YvFTRmBzsPBGx4g3/9bcnUIMuSCPhyW8ICn4VSXn7s9wj5RvWHHcYCocPGC/Qkkp6aq f0XkNHEtW8rm6j5NO46WWZ5CICsz6HFpcpIZ247rS0OGXFY0aqQtbMZ4/TZsnTj3YyGAMZ /GFNhVkM9WPuL+2SVKVixldKBSz77xUld0z5M5Wv0YmXIODdmgFxsz9IwWNsyedi6a615Z KEnaVF4ggy/t5VDPBxMbbsXrN+PXw0KW+J8VB+JXrfPqN8xqcxUXANfTPeAB9Ac9Ht8JRJ s1bAFbDkneRUDE+Q7kgxHIc3axK+cPWY082yXGWGGX0YCLy0zPxcK4oSGkrrwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712607951; a=rsa-sha256; cv=none; b=O29aiH0+G8etE9k+N6KRmhTyssyUs8OffTIFjJi947GkIagj7PI4BH9Bt+hRUHP1WOMH1R ahUfYk6DfVIzR09Svwc3Omtp/VD956FCKDBs4M4n58zLrftk0yO6dBPzlJZHBn59/dGOeC cM2OrkqLOgmtyag6174nfDmlFQDBUjVIcgrcFCpyLren0aZvt+feFw91H9EfRzZcMeXVSc 00L/MSYLuzccIqsdPPS30cOYpKMmfPqsrxsOPas8kcZLlKgs+9PWU+U19VuIyGr9zwVtqZ n5E4H6cTtpOD3+Kj9dbmn5yQwIdlODZUSPCKioKue6f69kyTnxEEPhWpEVCw9A== 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=1712607951; 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=rrF481fEdBwv1CFeOVj8D8hEyzToCXORAbo80ZD5HKA=; b=FZR+/nUDAuVcqqQgS5+h7qCSWWiYrBqqoMhNHH3b6Oowh9k9Nzugb1eBux03ICXg49rv20 8Qkk6AIsl1q9nLGCOzmbj1aPVPT/fX8MGHWLLQ5f5vH3drkc81JsQVgcn7rF8dmQHGyhtf f4fko2+XcHP+0UQcxtJYAfJm4jbQSYywgFnNwoI8S0JP14AE005LoMcV8p4gGZxHCwAO4H Vvc3Aa7mu+KCSrWQufYg/861LkaHF8P1MFYFdOJKuRJmFTqhcUeAwV47TPBUnoFrRDH/dq LZ0jTSsUbBm1f82JS6u8rEHbreKjilH7/utTP/4fo7pwfOi5o7LXbI1U3NQnGg== 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 4VD0wH5P1JzQg1; Mon, 8 Apr 2024 20:25:51 +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 438KPpQU039946; Mon, 8 Apr 2024 20:25:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438KPpR4039943; Mon, 8 Apr 2024 20:25:51 GMT (envelope-from git) Date: Mon, 8 Apr 2024 20:25:51 GMT Message-Id: <202404082025.438KPpR4039943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9fc935855951 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fc935855951ff8277c669b2aa248fde63a10175 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc935855951ff8277c669b2aa248fde63a10175 commit 9fc935855951ff8277c669b2aa248fde63a10175 Author: John Baldwin AuthorDate: 2024-02-09 19:53:43 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:53:54 +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 (cherry picked from commit eb86c6c5b462c996e44c45ba496937b75ef22da3) --- 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 177cc3a168d9..391a5b8ae2a2 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -913,6 +913,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",