From nobody Tue Aug 9 19:58:53 2022 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 4M2P5n51j0z3j7Gg; Tue, 9 Aug 2022 19:58:53 +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 4M2P5n4Xxrz3gwp; Tue, 9 Aug 2022 19:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075133; 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=LssugkbZREGuWcBVn5azNCi+jr1lXfKRgiLz/Hk+TBo=; b=FKp62wU6ZUZBsxjIBgnvSnU3kWgWnQds5HSpaXI4rRZG/el2/3Oxd4cJF18a16aMmyhFS1 VxSsEPDUn59U1jSyfUuxXx7iJISkG6bem4iPB5yzIZizbnjZ/Qd+gXxbF5DahPrVkmjqFy ZtF5NjrRfb1Bda6AYcyDY38FVXdjGYHi2qk2UhQkC44ZhLhr6aco5PS13uRIAN1JfichkB 8DOlXd/JttTEoSTa4mmBOHM/KOQTgXTDNMukDJD4q2Ng/c+kaQSxICs01roiWOPx6Q5b1o e0VA3i96V9iz7AxA+EtshnqN1bDZJrXKCPEuJzpe1L3pqMbICYwpLOm6cW0/FQ== 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 4M2P5n3fsvzkFm; Tue, 9 Aug 2022 19:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279Jwr2R021417; Tue, 9 Aug 2022 19:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Jwr67021416; Tue, 9 Aug 2022 19:58:53 GMT (envelope-from git) Date: Tue, 9 Aug 2022 19:58:53 GMT Message-Id: <202208091958.279Jwr67021416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7f83d23ecfce - releng/12.3 - aio_aqueue(): avoid ucred leak on failure path 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 7f83d23ecfce15cc83f51aa9d1c4f95c24448ab9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075133; 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=LssugkbZREGuWcBVn5azNCi+jr1lXfKRgiLz/Hk+TBo=; b=jsbJ6Jrke99EPa+rJ9L88KUupIZ+xqMOGQwdJ+TB1qLvHtyg+aiTddv7CdKPN7eGUt8LkB OfsLWesga5HE22OFkrgAolU5jLkO/XYLK+CMKY5CuP2AaPNAOiFQwIZpkCwrqqhr5tQhFx fQcAwdIviWHDdXhZNbW58WXxzrUjBgCNgjtVF4Dze0tO78IncLsU6BZ3Kuf//9M/VNuYKJ ITlnxvioQXwqETLwfT5erSNblFn+KJrUrNzfTLnrOBPh/Y66wonATqq9HqOkwRtHEF29D5 EIhpN+SkETBn8bmKVs4L58WyJ+fsAmVjoxe+u2wegi3LlwstubCHmROJMMNJQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660075133; a=rsa-sha256; cv=none; b=OAPTg1yAqAHflH9bJ7g9A4bNVBYhPYMRfxx3VhIAJ+KKcOcV2SfoFYAVKjPMtdVavZ9lrU i7y1U61cFylp3ixeiZgdHsimcalXRK7cB4+PEZXyy3a96f0C3PvpleYPw/2Cq/Xoyp2rfB LV6bOat8hrPvkZ70gkSnh4FqRDgtsE+Ct2HmKRzookD/IvD9WP3ojteQtqTMk6sGosT7xs x50buhen3Oa91UYyLeZPf3bxtITgMWpj4t3hYcCK3fWS9jmGAOA8es+br3yMzLlC3Qbkvl veGP9lzfKYIcCA1xi3JDzMo0DdX4aZ80FqPTQbaKVzCbH7NkbfPM9x+biKgx3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f83d23ecfce15cc83f51aa9d1c4f95c24448ab9 commit 7f83d23ecfce15cc83f51aa9d1c4f95c24448ab9 Author: Konstantin Belousov AuthorDate: 2021-09-24 00:14:56 +0000 Commit: Mark Johnston CommitDate: 2022-07-25 20:07:02 +0000 aio_aqueue(): avoid ucred leak on failure path Approved by: so Security: FreeBSD-SA-22:10.aio PR: 258698 Submitted by: sigsys@gmail.com (cherry picked from commit 45c2c7c484de7747014492b17ff89e323ee66496) (cherry picked from commit 76ed54dda74ffe8c7284cab10a4b30445a8db12f) --- sys/kern/vfs_aio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index d68301d3d342..ba46a5031410 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -1616,7 +1616,7 @@ no_kqueue: else error = fo_aio_queue(fp, job); if (error) - goto aqueue_fail; + goto err4; AIO_LOCK(ki); job->jobflags &= ~KAIOCB_QUEUEING; @@ -1637,6 +1637,8 @@ no_kqueue: AIO_UNLOCK(ki); return (0); +err4: + crfree(job->cred); aqueue_fail: knlist_delete(&job->klist, curthread, 0); if (fp)