From nobody Fri Jul 4 13:28:47 2025 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 4bYZGS0G5Hz6155D; Fri, 04 Jul 2025 13:28:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYZGR3wPcz3MBk; Fri, 04 Jul 2025 13:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635727; 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=NdDYSMeF6CGL3E08YEBS7UG95OVVEgUx9REEbH9kCv4=; b=g6blnGOJACfolCXoPPYEH+jVYuwkIdI7MTRRDQYlYAvg0VUXwW9Q6bzjVUcmhsnOdO65WT DWg3yHIwoeXodXf0LV7QRnkIBDKfhhLURvxluUxvI1osdO8FRwogfTqDgH7TJm+vVhnQ31 q8cFuhEFqU5WN11++WT343uzXviLfJ8USha3vm6zay7+ovnisualije9/ARSKnWWHCJqY/ h1GirBnIFjHEcoRYAxzFv5zCeRxlUFmCdnAVh1IeSs++AVhQbsMNPavSWUJaboZ224/XA0 RIAwH0Ikmd4vcsb+QcdDIWRjHUFclWCENVXdxjpDBeddr4EoWUFsbWJA/K7UcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751635727; 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=NdDYSMeF6CGL3E08YEBS7UG95OVVEgUx9REEbH9kCv4=; b=RxRkSllXHXL75h0WWvDtRgnlK+spgP4ANFM1Yq1qQZPzI+vzC1FWU6/tZgTZrc6ei87Mqd 7dejaPzKftoIUocLMk9sMKGZqTgP0Ug/o5xEPOqwsfJn73/CDxpheKtpck12+mEwQUWsjy SIMyJHP0zgjCVQV0ljZfAUitrzjMce6pmyt0+ewwc+IYPBMhU2Y7Ieizfq7MqHwUiXIw4X a2hGkqovMOhmriU93J3WTQjQJqWMldodpStd6N7e1I2hCnkqJkTiqkMBce6En5VWWkJvPY 1cBUU6r+V6ehcdW/nVnBBVpKgwa4bdzRoHQyuNTx6gtZ/Nto7SKVorx/nUel4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751635727; a=rsa-sha256; cv=none; b=XfwEQHFTBCSy825EywdI5rWA0RA+TKylc+UW00L/+qCzz148Gf3ulW+DNAoQvpMZSTECay FAQ++KrNUJl25uUdSpUqUoqaGbGINmp7KQI75V2ywUGHGFOdDdncEgWqraXdH6SDXyCbsu 96Y48oV79cAMy2jQZwuJJ1u7C2nsxb9EvnI4hIbp3eQWuZ+Kkn70SFfvxttZSIV3XxCGJf NLZF5Rq0IuS3oE974HSPZakrFnj/OokId4BMESH6+7V+4iClnjsmofHWAX5uiycU0yMBhD QH6YlQzIp45Y2ttsZX6Wjn/NwzC/75kAWFCWXER/pJumtceafypEbk6sqK4PPg== 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 4bYZGR1WqKzsD4; Fri, 04 Jul 2025 13:28:47 +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 564DSlaT005885; Fri, 4 Jul 2025 13:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564DSl6m005882; Fri, 4 Jul 2025 13:28:47 GMT (envelope-from git) Date: Fri, 4 Jul 2025 13:28:47 GMT Message-Id: <202507041328.564DSl6m005882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Popov Subject: git: 0d1dd7c4863a - stable/14 - p9fs: move NULL check immediately after allocation 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0d1dd7c4863ab0856c93becf103d59acb917623d Auto-Submitted: auto-generated The branch stable/14 has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1dd7c4863ab0856c93becf103d59acb917623d commit 0d1dd7c4863ab0856c93becf103d59acb917623d Author: Ed Maste AuthorDate: 2024-06-24 16:21:19 +0000 Commit: Gleb Popov CommitDate: 2025-07-04 13:28:05 +0000 p9fs: move NULL check immediately after allocation Reported by: Shawn Webb (HardenedBSD) Reviewed by: dfr Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45719 (cherry picked from commit 1efd69f933b6ad4177ecda78cf4891aa9a1e8f6b) --- sys/dev/virtio/p9fs/virtio_p9fs.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 77f5b1334e77..1c076e353bbc 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -332,6 +332,11 @@ vt9p_attach(device_t dev) cv_init(&chan->submit_cv, "Conditional variable for submit queue" ); chan->max_nsegs = MAX_SUPPORTED_SGS; chan->vt9p_sglist = sglist_alloc(chan->max_nsegs, M_NOWAIT); + if (chan->vt9p_sglist == NULL) { + error = ENOMEM; + P9_DEBUG(ERROR, "%s: Cannot allocate sglist\n", __func__); + goto out; + } /* Negotiate the features from the host */ virtio_set_feature_desc(dev, virtio_9p_feature_desc); @@ -367,12 +372,6 @@ vt9p_attach(device_t dev) SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "p9fs_mount_tag", CTLFLAG_RD, chan->mount_tag, 0, "Mount tag"); - if (chan->vt9p_sglist == NULL) { - error = ENOMEM; - P9_DEBUG(ERROR, "%s: Cannot allocate sglist\n", __func__); - goto out; - } - /* We expect one virtqueue, for requests. */ error = vt9p_alloc_virtqueue(chan);