From nobody Tue Apr 15 02:25:39 2025 X-Original-To: dev-commits-src-branches@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 4Zc7LD3bB5z5sjTT; Tue, 15 Apr 2025 02:25:40 +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 4Zc7LD0lJQz3MKY; Tue, 15 Apr 2025 02:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683940; 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=NdD7z4y4EnZ8x/g1KzdQPdBm9//4Kn8xdCYHF1YmE30=; b=ShO7zVMGo0sJSPwnBKZ2XykZ2teDB9iaYs5kSuOVyW5gKySnhc3abdAoFyde4I6ujXWTk9 P3ii6zxyxrDwBn7l3y6oFLrdrVTojfncZ1dKyrBeigS1z1QwDfz2HKPIi8H5qYXEQjj5XW REoTEHQxmsACqAJpcI122rOfQynGpyn00Bk8xUnOM4i8drHmNr+FGP4L0o95mFXrIscJgT SXS5VlQZA1wU7shZg50MKf/1im2/sb+YrCTELs1Lz5J5goZixQmllAuSS8k/0rRhm+7fBX bg8+fRHhMVqwIv3ibjuA33okAfPwQCfC4MwsoC4PLR2KtswusVbKM+ei656IQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744683940; a=rsa-sha256; cv=none; b=QUUj+puafWyxt3v+KBqNdVoC6iklS0/kM6F0E0Q2du0KlV6ItL4TBu0j0Nhl1oVmMIWuPR F4AzMCBlDVIg62UCbHJ+X8xnYJotbsgB4y3Y+dz+8jjWbXeKmm2t5F+u1OwOt0oZpZwYpF u1fvMIDAGverR/TrUjs2JpK1RGCW/ffyRu6efEE4AUJZs1s3MdtIMb4QpebhPxo9bz6pzz lBBWcfsesYruR3lZPAqW9TlVWjnchQLKe6jDFTsuDT4L9FCgR/qRL3hVExYoaVWRTGt3mV wuur1mWkck5/BMA/F8qVmWbSx6Kn9jdDeEtbPhTMAt53qJf02SC1Eefy1u98Xg== 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=1744683940; 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=NdD7z4y4EnZ8x/g1KzdQPdBm9//4Kn8xdCYHF1YmE30=; b=uuGLwJIRJC/mjvfakXgmWyrzz7eflUUCtAq0t5WGAldOf+MKhk5MaCO0EImxT9UXsi0GYA sNi2OrBsj/z3Ok272xe1CJs2JmHUBFo7Ip0xUrKwDhFHmp7GcFioqzPj19ryjBeRYkH4Lg oVtK+Fpv6Sa/cJKqbr111b2uBQqkZBR4G+wIKTvDsfyeInWg8NOKwClvdM6rh5MYyMpIfM xRDbE0isFrIy/wz75oG06Cz0e6E35UEfJzxntGShRNYMpeJ4yPATYp2Wzr/7SQwudxSnt8 qKBjO9C0uFNsWlYBwjOkgEhdQFIFSpd+RLfgZAU0gbN0rDTpy31HilMpfDPx7Q== 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 4Zc7LD0FmVzJ3; Tue, 15 Apr 2025 02:25:40 +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 53F2PdYX014699; Tue, 15 Apr 2025 02:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53F2PdTY014696; Tue, 15 Apr 2025 02:25:39 GMT (envelope-from git) Date: Tue, 15 Apr 2025 02:25:39 GMT Message-Id: <202504150225.53F2PdTY014696@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: 74a0b8908483 - stable/14 - ptrace: Do not pass a negative resid to proc_rwmem() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 74a0b890848362f1a4115972262a518f3d83f504 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74a0b890848362f1a4115972262a518f3d83f504 commit 74a0b890848362f1a4115972262a518f3d83f504 Author: Mark Johnston AuthorDate: 2025-03-29 08:54:48 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 02:25:24 +0000 ptrace: Do not pass a negative resid to proc_rwmem() While here, avoid truncting uio_resid in proc_rwmem(). Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49479 (cherry picked from commit 1a80a157cbe823ba75bb88823dbf1b245fe87c99) --- sys/kern/sys_process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 19fe8bcc7627..497084f83563 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -393,7 +393,7 @@ proc_rwmem(struct proc *p, struct uio *uio) /* * How many bytes to copy */ - len = min(PAGE_SIZE - page_offset, uio->uio_resid); + len = MIN(PAGE_SIZE - page_offset, uio->uio_resid); /* * Fault and hold the page on behalf of the process. @@ -1388,6 +1388,10 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) case PT_IO: piod = addr; + if (piod->piod_len > SSIZE_MAX) { + error = EINVAL; + goto out; + } iov.iov_base = piod->piod_addr; iov.iov_len = piod->piod_len; uio.uio_offset = (off_t)(uintptr_t)piod->piod_offs;