From nobody Mon Jun 27 17:26:49 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 EF9FA8A2196; Mon, 27 Jun 2022 17:26:49 +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 4LWvm95S3bz3CN2; Mon, 27 Jun 2022 17:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656350809; 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=XzSORfs5sNNkIIOYFNidPVbBI9bUkVKEkdvTVtnn8d8=; b=vjqr3INCBmVTIThRZw9xyBp3ic7jvQak5ODIsalCkZ/lZtSwUVS81V2z99WY/87kNwuFoL wgCD/QF9Pig4jN/gHFA/GevdeKilDhXMqtklbyl8m7n8+DnOOPs3zUB4PJlECMdg8pvnNk 1eH+qKw8/0oc6ofRSYSqX4C8CoxjJta9vxIAs/Wev4eBCWptwzDU6K1ECz4zG+xQga9Vvb 4dfZme3N3Fw6wMxk6ZWDDrFSxXaDXji4PGbMZqtAZ+DhgGGJ1s/mxvBODVmdGWIJiVhEmh AAG3ZSC1nJSU6qwImup4ojtEof7Ap4iFzhEnk5Pood3TB2DNPLYiKd+SAHxgAg== 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 9C5734B05; Mon, 27 Jun 2022 17:26:49 +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 25RHQn8s042242; Mon, 27 Jun 2022 17:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RHQnlf042241; Mon, 27 Jun 2022 17:26:49 GMT (envelope-from git) Date: Mon, 27 Jun 2022 17:26:49 GMT Message-Id: <202206271726.25RHQnlf042241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 76ed54dda74f - stable/12 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 76ed54dda74ffe8c7284cab10a4b30445a8db12f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656350809; 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=XzSORfs5sNNkIIOYFNidPVbBI9bUkVKEkdvTVtnn8d8=; b=SZII4VTyw6joSD+ohKAOBARpwq2nbH7rNdVk6FnZxUMDfe2ojNgR5ZQSo7uRED5CRUfMnI xNbdnv1qYPQvGFkqUkt1iUYfRK0OSaM7TdUEK2tMvJvSqVEhzUjMCA7RfiCFcx/I1J8yrU KMmGdMUVVc1GfjBH/MU82OZn2M73q9CrCeMUbhxeHDqyasiLlV41Qt0XvA6vqM6l1Wox40 Jg1kF+EOz0Xl9JZVtITtZN7hK2T4nufKJSftR0p6GgWhe8Bb8oWv8pkSTLGObYDNQo1bvd VUsfE2ml7J1VGLlkr8I5S7uah9US/OVSbxOCS43IbUY1GKM9fgjHhDju2fpjPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656350809; a=rsa-sha256; cv=none; b=TaXQpecMLft15RWYGramNHEiGhTMH/ymbJ5jLcmjHnkcGqbfJfWBB9Hshqnst9AgbvfprP 8HGtypD85b5vYlcXga/YO5iUv/uBMBj4QBSSX9Q8FKA0/bftEqIvvIgKIH4v0R7/VVFaGl iU2zb9WcoCK/19mpvgz4SpqnF1nCYKWjYDRlxclR1LJ/rj9awt6rHpHBCpiSSgSYi9JO/h f/L9Mtvsi0IQfWuam6JguE6ngEYFxX/tw0Cq8r2HQzNTFgnVW4oHox6Kd15ny/aO7OtN7R kvEMhbI0Mhjz/mLBXrOOu7R45/D3G4yogBRuQqWLnPKxZLjKWoTyNrCbquLW+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76ed54dda74ffe8c7284cab10a4b30445a8db12f commit 76ed54dda74ffe8c7284cab10a4b30445a8db12f Author: Konstantin Belousov AuthorDate: 2021-09-24 00:14:56 +0000 Commit: Ed Maste CommitDate: 2022-06-27 17:25:44 +0000 aio_aqueue(): avoid ucred leak on failure path PR: 258698 Submitted by: sigsys@gmail.com (cherry picked from commit 45c2c7c484de7747014492b17ff89e323ee66496) --- 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)