From nobody Mon Apr 7 14:11:15 2025 X-Original-To: dev-commits-src-main@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 4ZWWN41SHBz5tKQb; Mon, 07 Apr 2025 14:11:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWWN40tRJz3T35; Mon, 07 Apr 2025 14:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744035076; 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=tAn79C4NhKOjPsoHKjED6gbPiyFPfo4y2EUtjHSqJ9Y=; b=ferk368BXq5N6YMbqukucCoUCngp2AM9iTLOJfHdp1+V+Mnl47oIpAj6cz72d2+m7aCFOK 6rVk6JXzqLMSGV1w+0YwtLxR8/4tHFz0mJb3Eck7AvhDcuBiO0hZmVALwEPNBDFbkTF1wL aeXdRiskMuSx1qBOnZWC8CdlNtwbcA6vHkqTJnDCDmTXHkdOO7qcwaXVjdFnkG3WwtiPTP mMbwfjmWUjaPM28qogDxgbq2fKxGTpI/Ozz8DSnuIF1fPxs7kUQll4jZnein4Ei3P92wIl 0yHPgktl2zyLb6HZ+om1IJVJ4OJMehs6tnjyxTTCUQ1uIJ8asOaA/uF05EhQkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744035076; a=rsa-sha256; cv=none; b=VMXSeq+Sj1RgrMP3bUmeGg7uWb2w/CvgQyzHHFbx/1CJLImyZXtFae2D3FUm/hYFeN84cK zZiD5rg/Iym0+PbXsgL/8TnIOlK450Ck7Bx67qBf30WZpEGzpnLZEuh+no+tFb9s3dVzg0 cGg4n+YEzae+JJ+aOWyp5zjxDpdssAB9guGsxctl0it8zy/q2uhoBkVVtWEj3ZrWJsz8nF u5e7DbViAu1P/9EtmGf4ocTmheapma6U99kaFEiuy0lnxG8Rqauwn2AuLv57Bcbv0zPHnD orkSs1EKona454u5VrKCRvugQv4E/eC1QSJ4+cOAdSDM1EirNfQMU1qYwra5sQ== 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=1744035076; 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=tAn79C4NhKOjPsoHKjED6gbPiyFPfo4y2EUtjHSqJ9Y=; b=RavF8aTV9YHBKczJga/ZoVN4UZVSNmg6B2tv04kPB16rK0iWv9r/Yf39W4Ool+MD/GuU4i 7otfoaiCS/1KkZo14/N0kpRf5Rvp544IVDI0rlrUDR8QiIF7TmtKPf1xQFXCMqp/U+Flum ekBj5xf+p0/YchCsuQ0xRzNr4vyQw0pQwuYEeuSNDQwchP9tdnMusiyrlU5RTWQgc1/E88 g/2tNmuM2lY6RIQhs5SFfHmVqtzVxvrXfPn+Bdt4X3/oGPscWzq69HRLMt+yI4Q11I/3lD +vqKBh3rqfsBLH2vU2Oce/Xkwo9wZG617WvQ14BRtVGtTFnJQVwYTCXbbASwCQ== 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 4ZWWN40Qd0zqbg; Mon, 07 Apr 2025 14:11:16 +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 537EBF05092675; Mon, 7 Apr 2025 14:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537EBF5q092672; Mon, 7 Apr 2025 14:11:15 GMT (envelope-from git) Date: Mon, 7 Apr 2025 14:11:15 GMT Message-Id: <202504071411.537EBF5q092672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1101d628223d - main - copy_file_range: Fix overlap checking List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1101d628223d2188c244a4df9b0cb4eaff57e968 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1101d628223d2188c244a4df9b0cb4eaff57e968 commit 1101d628223d2188c244a4df9b0cb4eaff57e968 Author: Mark Johnston AuthorDate: 2025-04-07 14:03:50 +0000 Commit: Mark Johnston CommitDate: 2025-04-07 14:03:50 +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 --- 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 1a3400a87eeb..7b71ffc76892 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -5075,6 +5075,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.