From owner-svn-src-projects@freebsd.org Sun Dec 13 00:04:30 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B47104C5638 for ; Sun, 13 Dec 2020 00:04:30 +0000 (UTC) (envelope-from asomers@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CtlBQ4kvrz4cB6; Sun, 13 Dec 2020 00:04:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9559B26118; Sun, 13 Dec 2020 00:04:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BD04U1P085398; Sun, 13 Dec 2020 00:04:30 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BD04UkV085397; Sun, 13 Dec 2020 00:04:30 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202012130004.0BD04UkV085397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 13 Dec 2020 00:04:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r368600 - projects/aio_writev/sys/kern X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/aio_writev/sys/kern X-SVN-Commit-Revision: 368600 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2020 00:04:30 -0000 Author: asomers Date: Sun Dec 13 00:04:30 2020 New Revision: 368600 URL: https://svnweb.freebsd.org/changeset/base/368600 Log: aio_writev: don't corrupt the AIO proc's td_ucred on error Modified: projects/aio_writev/sys/kern/vfs_aio.c Modified: projects/aio_writev/sys/kern/vfs_aio.c ============================================================================== --- projects/aio_writev/sys/kern/vfs_aio.c Sat Dec 12 23:59:05 2020 (r368599) +++ projects/aio_writev/sys/kern/vfs_aio.c Sun Dec 13 00:04:30 2020 (r368600) @@ -779,10 +779,8 @@ aio_process_rw(struct kaiocb *job) if (job->uaiocb.aio_lio_opcode == LIO_WRITEV) { error = copyinuio(job->uaiocb.aio_iov, job->uaiocb.aio_iovcnt, &auiop); - if (error) { - aio_complete(job, -1, error); - return; - } + if (error) + goto out; } else { aiov.iov_base = (void *)(uintptr_t)cb->aio_buf; aiov.iov_len = cb->aio_nbytes; @@ -839,9 +837,10 @@ aio_process_rw(struct kaiocb *job) } cnt -= auiop->uio_resid; - td->td_ucred = td_savedcred; if (job->uaiocb.aio_lio_opcode == LIO_WRITEV) free(auiop, M_IOV); +out: + td->td_ucred = td_savedcred; if (error) aio_complete(job, -1, error); else