From nobody Fri Aug 14 14:36:01 2026 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 4hM4Xf4z5Cz6nwMZ for ; Fri, 14 Aug 2026 14:36:02 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hM4Xf0rcRz3h5t for ; Fri, 14 Aug 2026 14:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786718162; 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=flPwg1PEgJlUjLGIg01H6kxIjU1okcpaHostLoVnuHo=; b=IrsQO2+PlFcsd1AxMuYlgxSmtwZhCt6cusywBNgcULTvPXO0xoaKu0qRYsI2XVefKYzOIn wEgEIs4SxV8wg6V1m9YciF/pm1qlqAazwSA8tqT5f2cuHD7dDIBPi87ulMVvucmnfhwro/ I8T2iwQn1p8WHTr02bae/326pVGoRiAby4MNfmvLQmKRam365dkb64gv/8gqAGA/7W0THJ RtaTdwNo+OOkE8wvtiKdKvgXFPcaaslTWCEuU8TFNlQO17wNQA5xyP5VjpM7asCQfnzfGU uJBOe/+/leCzf0qKhBHUwnSG/kp+rCwHaYrpnFlc9E0pQfd1aLUzNeILUz+b9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786718162; a=rsa-sha256; cv=none; b=pViDgzyR3lI9A9eiKLLUekARXyxwN03gXmD2kFNIzlVGfFSohVrF9JfSvKBdsC3nInvGRI 1FtG1U5Y63Lvlrw1R5U3Edja5O8QkNfkBJ6XLLCOjR5vNC+oEmLv0vSPS0fBTTz8Qc8Br9 HSLLrFxbk3W7nHxQaL2L7dkEnpKREgmyykkGcYpUIq9T+LwVw2limeBIKUuKZD+ZSnaNnG fbfat46WiTRxh4V+IBQnq6Qnd5mDKPHNR7I5KbmExuBWGaBjaLRwxmF7Bzfbldyedh24Wk Jkvmml9UusiGzEvVzoGpOFoEx1BTIrodymQz+NvZEIH9KUfV4ZFYw+Fw+3G5Cw== 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=1786718162; 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=flPwg1PEgJlUjLGIg01H6kxIjU1okcpaHostLoVnuHo=; b=k04LTXc13tcKQpJO7gjlMxB5dBasm0uf71J6SzHyFQKH/PqQL+exXZeLxGowPLQobM/IeC oV/p1Ve0x96WSY69a/MV6nGEkGT7zQX6SLOPsaf1C8dFDNPkg7HeTe4cR7DKRi7RSBwv7J m2mAE5BPAHJP+2ARf2jS4QPvtZ9GK2NH6H0i114b447YSbD8RyIU1Er9ES/tEM7GJuA8jY RY09PK0KI61CI+y92MJRBUWDqa3tNkQUvo/EfXleToEITxKXTZH2nJrnKXuQMhdYU+INQ7 TaW6YKPUHSPZAPgHenJ9hnjFd2HqAlizAfYm0tFCSb4SmQDTDp/s+O4ZB7V3ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hM4Xd5tKNz11sF for ; Fri, 14 Aug 2026 14:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 14 Aug 2026 14:36:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f6000e9dd934 - main - kern/kern_proc.c: do not throw out read data in get_ps_strings() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6000e9dd934db9fefc31eaa07a7d8fa9277484e Auto-Submitted: auto-generated Date: Fri, 14 Aug 2026 14:36:01 +0000 Message-Id: <6a7f27d1.3d5c0.4f6aa7b0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f6000e9dd934db9fefc31eaa07a7d8fa9277484e commit f6000e9dd934db9fefc31eaa07a7d8fa9277484e Author: Konstantin Belousov AuthorDate: 2026-08-14 05:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-14 14:35:38 +0000 kern/kern_proc.c: do not throw out read data in get_ps_strings() Since vmspace_iop()/proc_readmem() might return -1 on error from vmspace_rwmem(), account for this and stop reading but return already accumulated data if any, instead of returning an error. PR: 297512 Reported and tested by: Stéphane D'Alu Reviewed by: markj Fixes: e1b0d051bbf7 ("proc: Allow to make proc_rwmem() operate on a consistent address space") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58838 --- sys/kern/kern_proc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 41e5b6594981..6489feca99fc 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2064,8 +2064,11 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb, for (sptr = proc_vector[i]; ; sptr += GET_PS_STRINGS_CHUNK_SZ) { error = proc_read_string(td, vm, sptr, pss_string, sizeof(pss_string)); - if (error != 0) + if (error != 0) { + if (done != 0) + error = 0; goto done; + } len = strnlen(pss_string, GET_PS_STRINGS_CHUNK_SZ); if (done + len >= nchr) len = nchr - done - 1;