From nobody Thu Apr 24 13:21:17 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 4ZjxSY5SN8z5tHw9; Thu, 24 Apr 2025 13:21:17 +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 4ZjxSY4TX5z44v6; Thu, 24 Apr 2025 13:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745500877; 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=WQRTwnIFw0mxCOL6/r0plq5AvRWCg+ZjJxL/SpVZtCc=; b=ZQIDM1d6rQI8tB7fyjNt3FqBTT3S5kGARgg2rO7kVvs3Y+u1x5n775MX5dRIFTCCVa4L4v 6i11dcTABJi93F1JzqUaOWgwrt1Gm+D9Tr3xCDtKI1/y6FsC2DOzS/ZJrNEY3bjtZAJluE RVqlMe7dQiorTyqxm2h4HY8gXWfQzEX9hGvJ6FDV0G6i8RLpmne2w8rAzTT2+jepGxhbLY JkGUoUZU/rOFlixaewv8dSReF8uadiFAlhkvmQOGPRj6HDaGnTCCbY0kEoEEd9lpxiGgF5 n6fDBuaeLcoKUMOtbbb3gZgHSYAtFseP6RkBB0h694ZV5Zzg/pNP7Ew1Y0i/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745500877; a=rsa-sha256; cv=none; b=gqsYm+4+e53KuYORLzavL788QPx1TLNVNVWdEY2DLMNjPy9pOWje84iSYOkJDfh5lD6S4m pCXPytn3CoaHYALHUfUNvKywuFx3EDpnhdPz88SiUJdevRTAcw3E32ai6GOaFAyzNI3Pjs s+Jhrj1T1ZLX1CzdZvcGh0Ae0fx7Ft2i4W8bhSLQAFBvXIc3ktoHm3SfyFUPhVSX1iPjUO VMNjfA+1QKYNu9iNdYjS07vqCUpaXZ/N7F5uMWhZTyRn54QsobNt4OoAKE67nWXsH8AFOQ n2pRV4PcNHXJfZDAmQYaxTrhwzdrrDCClZMCYJb+nySU6xM2a9atmzWM0xQw6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745500877; 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=WQRTwnIFw0mxCOL6/r0plq5AvRWCg+ZjJxL/SpVZtCc=; b=EpR76+6HskF1ii2+Ra1YHIa6srZkWfQgnvcVgVVNstAymB7BI04a1JKaWGXCX34RnzFlWr hdX1lDP8pWxLihsmBe3c9KUE6wqZzHoqgBDRJs8lPMe4CraRORraszo02KmI1FnqPxjVa+ oxusSipxIgrYjXn5D2lAECNPredJzJjI2AqCATLDV6UBTUIw1h9wP8qixHqXxBgAclHqIn EU/nuvaCuKVRSyvg/LEk/d2GuGPGLjN3WZRpknA210S8HvcdSwaR7LonHXJCltVcOUL+ws ubi7pyPRdfsKzNXmrxxJOF6mCDOwfVrA6jW7DXjWm5FPuzon/7UuZ3awfWCr2g== 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 4ZjxSY40cczrv7; Thu, 24 Apr 2025 13:21:17 +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 53ODLHCk038194; Thu, 24 Apr 2025 13:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ODLHrB038191; Thu, 24 Apr 2025 13:21:17 GMT (envelope-from git) Date: Thu, 24 Apr 2025 13:21:17 GMT Message-Id: <202504241321.53ODLHrB038191@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: fb405ecd9f52 - stable/14 - copy_file_range: Fix overlap checking 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: fb405ecd9f5208ea8d6c5d1e7352963305aed04b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fb405ecd9f5208ea8d6c5d1e7352963305aed04b commit fb405ecd9f5208ea8d6c5d1e7352963305aed04b Author: Mark Johnston AuthorDate: 2025-04-07 14:03:50 +0000 Commit: Mark Johnston CommitDate: 2025-04-24 13:20:52 +0000 copy_file_range: Fix overlap checking The check for range overlap did not correctly handle negative offests, as the addition inoff + len is promoted to an unsigned type. Reported by: syzkaller Reviewed by: rmacklem MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49674 (cherry picked from commit 1101d628223d2188c244a4df9b0cb4eaff57e968) --- sys/kern/vfs_syscalls.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 9f8c960d054c..02908f76ef85 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4997,6 +4997,15 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, if (len == 0) goto out; + /* + * Make sure that the ranges we check and lock below are valid. Note + * that len is clamped to SSIZE_MAX above. + */ + if (inoff < 0 || outoff < 0) { + error = EINVAL; + goto out; + } + /* * If infp and outfp refer to the same file, the byte ranges cannot * overlap.