From nobody Tue May 13 12:51:00 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 4Zxbts1PGDz5wnmH; Tue, 13 May 2025 12:51:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zxbts0XFbz40sf; Tue, 13 May 2025 12:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140661; 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=SnbfZxzRRI2hQaTidfJNc8QzprDAK8PFNuirWkrWFOE=; b=Pgq3+28iXXIv3d/A9IEbS9eg9dU1UbEi8KqPM//s3hLGeN2L+npQ3bsWYa2XAAs96BL80g k1NziPNKHIWN8r72g/Sl20u85hwLqNhMgh9USgNsEOwgPFSkKw/Qap85WwhRO54vQmfokM 2I/elsruvqHLJUee0SKZeT7SOOQ+uRHLi5xQSstry1EH/J2lmcFF5Hv9f1hllbIsJLkuWY XgX8idzbkiTgV4AzY5sUmsFloKnLLdFa3yE122fVd4HyEeDkm0g84hir+vAP4r3Q/IRhkA YMZvkmJxVOMvijzkzSWC88x/oyBQG5IP24r5Lu0dg3AaOdTwJlA2QfJ9q0YYtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140661; 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=SnbfZxzRRI2hQaTidfJNc8QzprDAK8PFNuirWkrWFOE=; b=WhQ/V6yIYy5YLLwq7sASEWEm0Qd4irkAs8cOrKalFQeD0fhH2Ial/L11QRqALdZvJ3D2Qh BEnFqi3wNOBf700ztW9DKkdAbBOlSo8XJNRbB9UdQ2uKbIFbFePAhnVd0OkRYdL5cma27Q kH/2e7DWaOPRBgentjighvwmey8HI5/MQD8rTdvei33vC+d1eTS2UbieydXXurgwY8cUO5 hKlrQ7FC8jZ5UXza4hdwiYjrEm0L8edRc0xRerAOBRnS16a74FZg4fnRq64RRTG2MxCsu2 /r2YTrDYLesY28sRu/Az8r5+1wfY9Ij3M+GKIpvPBeJrgtfniB5qEyuY0OyL9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140661; a=rsa-sha256; cv=none; b=h3YW/rFcPdKtS1aCsxiPdL4YRvbcKeMWP7Rd3oGG33QVBODV1ulqq+HI9WxGtgiLr+n8et n/eMspyk4pq22IvGSEOCUEKUv9P1GfdgoCbwyHCg89GWggDLM4qzbY9VQMOH2S0Rg53d81 SLBOHx6Fg5i/DYPDFHNLHYh2V92IDDqI0hNnE3YMyuvMbsiTfV0mB2QwcB7JdQ7A2ETUqX 8LR+CSccOUCwDJgxQzPokhT6jAyzAObnGP0gFJhaare7coPb868uxr+Y8Pxi6RgXZqgkCt eg2YhreqYH2qcaTtf6EL2AwiTKGUTmm5hFoBFezmvPFTlMbe//lv4kW3Unp/Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zxbts0310zn6x; Tue, 13 May 2025 12:51:01 +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 54DCp0gi086935; Tue, 13 May 2025 12:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCp0h4086923; Tue, 13 May 2025 12:51:00 GMT (envelope-from git) Date: Tue, 13 May 2025 12:51:00 GMT Message-Id: <202505131251.54DCp0h4086923@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: df4d9abbcc04 - stable/14 - aio: Fix opcode handling in aio_process_rw() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df4d9abbcc04db5a195b98d5291ba15949fc03c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=df4d9abbcc04db5a195b98d5291ba15949fc03c5 commit df4d9abbcc04db5a195b98d5291ba15949fc03c5 Author: Mark Johnston AuthorDate: 2025-05-02 21:37:39 +0000 Commit: Mark Johnston CommitDate: 2025-05-13 12:50:51 +0000 aio: Fix opcode handling in aio_process_rw() LIO_FOFFSET needs to be masked off, as it is in aio_aqueue(). Reported by: syzbot+b6e15476c91852bb2264@syzkaller.appspotmail.com Reviewed by: kib, asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50118 (cherry picked from commit ab01a5f5628eb0d334f491ff06462cff214d5f49) --- sys/kern/vfs_aio.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index c5b0c7896a17..291ac46babef 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -764,10 +764,9 @@ aio_process_rw(struct kaiocb *job) long inblock_st, inblock_end; int error, opcode; - KASSERT(job->uaiocb.aio_lio_opcode == LIO_READ || - job->uaiocb.aio_lio_opcode == LIO_READV || - job->uaiocb.aio_lio_opcode == LIO_WRITE || - job->uaiocb.aio_lio_opcode == LIO_WRITEV, + opcode = job->uaiocb.aio_lio_opcode & ~LIO_FOFFSET; + KASSERT(opcode == LIO_READ || opcode == LIO_READV || + opcode == LIO_WRITE || opcode == LIO_WRITEV, ("%s: opcode %d", __func__, job->uaiocb.aio_lio_opcode)); aio_switch_vmspace(job); @@ -777,7 +776,6 @@ aio_process_rw(struct kaiocb *job) job->uiop->uio_td = td; fp = job->fd_file; - opcode = job->uaiocb.aio_lio_opcode; cnt = job->uiop->uio_resid; msgrcv_st = td->td_ru.ru_msgrcv;