From nobody Mon Mar 31 09:06:33 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 4ZR4xj3ybXz5rhYM; Mon, 31 Mar 2025 09:06:33 +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 4ZR4xj36T2z3YNh; Mon, 31 Mar 2025 09:06:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743411993; 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=t72eaCGnOa8wu4xsxJoqWl+wVOrD0DD7iLNzhjFKYcM=; b=CU0oQCuUvW8ZGTw6tTGqp3i64XUt+4dhwefoy2yJ4f4nE6K7ltDii7eFVIPnKa9UqO+VGv rDpLo71svybzv27iC3rl4hFaS6r5NTs0nNrBAQdKBHzE8qaUfn8F1RMBE/oJJYf90PRD2H R2cRio1mP/RCk3FcVW36AVKeZlg/5JCPLj5Fxhf6A56yYlADpDfCrt/ArjDGwbyzJ2T148 1GgW25iwPE3nsz/XG34s2IUYFN4IaVkzakcUqVBYM/ribATyN7cCUiOS+tuaHc3JkcunvT 035csMqCzdPo9EzBx9X4lad+eQAPcXQr6yQwC98Cp1yZnTHo+DGXM33nSdNLRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743411993; a=rsa-sha256; cv=none; b=pKbX+zbYuen9e2dRndqDebCSpatcCX7RV8u0vTppk93PQr3WCA6bIjSRDaA1Ir1DWDjvPe 0/IfscLUNUEQ5E3gCsgNxq0ZJSOc5OEou+eTWGSIiOe3BNWQOT4oMh4E+sgroCKEuEDApA hKq7V8Yw5yFLpsCgbR7C0pz9bAHrT3fRWBs6r4FJJkojmeix1hQQ1g/MabfsXh+PNGBkej um+NYTNPhjvzk7cg/2gqMvZ7s8zEg0+cdjctAEX5WKxT5VQE0fViBNgGgd10EkXpl7B+g7 +bC2sc7qVEfsKMFjjvVpB+IgaCZmWUTLHlTKXV6kA/PGiMMLWm4d0AazcDKW3g== 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=1743411993; 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=t72eaCGnOa8wu4xsxJoqWl+wVOrD0DD7iLNzhjFKYcM=; b=Q/pZnya0kdNUoAkaOydVMnGwaphqZuXvvZdFkUZ/KtSnowyp+kUjBzUslBq/Xp38cM4mGu 98wHxILCIf6jynzdpFPtcH8aYsObaQAsxg5sAQVMQybs7pqwze/2+AedPH1DGKn8Dtxbi7 c9cTJg1YGyx4zxGjbPLgPCBNbo6e7w9hzknTjq28kRiGpsx2ru9976kDUZTmleYihd8kqI 4rtoTxfIiWa6jqgtrQRZWnYNIF4D6zpvGstcYI3oAw6NR6VsZhCgmWGatWB6y5Cb17f50B UTJd3KTCXp7NeHXhUbAjYsy0mpPX+t0/WhyPbDXKBYRUg1LMzVh2OthcqAabMA== 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 4ZR4xj2NFKzfYp; Mon, 31 Mar 2025 09:06:33 +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 52V96XjS078765; Mon, 31 Mar 2025 09:06:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V96Xtj078762; Mon, 31 Mar 2025 09:06:33 GMT (envelope-from git) Date: Mon, 31 Mar 2025 09:06:33 GMT Message-Id: <202503310906.52V96Xtj078762@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: 1a80a157cbe8 - main - ptrace: Do not pass a negative resid to proc_rwmem() 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/main X-Git-Reftype: branch X-Git-Commit: 1a80a157cbe823ba75bb88823dbf1b245fe87c99 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a80a157cbe823ba75bb88823dbf1b245fe87c99 commit 1a80a157cbe823ba75bb88823dbf1b245fe87c99 Author: Mark Johnston AuthorDate: 2025-03-29 08:54:48 +0000 Commit: Mark Johnston CommitDate: 2025-03-31 09:01:09 +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 --- 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 c7dd505d97ca..5126f34e3dc3 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -387,7 +387,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. @@ -1382,6 +1382,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;