From nobody Tue Aug 09 20:01:24 2022 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 4M2P8h5mmkz3j8FR; Tue, 9 Aug 2022 20:01:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M2P8h24dJz3mR7; Tue, 9 Aug 2022 20:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075284; 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=gYaA1fR4Xeo5FlIDf4ucM8Pdi2zZ/ZgjD1vXRmVSawk=; b=DFuDQY1lyA/k6CSXkCzytccwNEBMCE/zQr3fVNRJZ8W2j7zKVLDU78TeGiYl8hAaMh3XzH bAvrU6azsmBJx3sDKcPn94Xz3gst+qGjFrRs8xq4x2RaoWbtEGzAkWjZcGj7ZBIAF5ftAq UiFvSEyVGx8LVrajjXHs4If5pe0LACEZ08TnRzX9BPHWBJaZZKfT5QIKTTac/vZmC1XAG3 tTy5QudlnXEGPoeF0jbZyHCPETm7fBf5ltq7NtcGg4+LpOwr87g5PwTGFQhIIW2fDzbFMm 79ASnBX8uf9SK/yBRYSSsEuyjjVT0Tsg8LN6Gnl4acieAS/X7TPdfl6k3YjNyA== 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 4M2P8h0vLFzkVJ; Tue, 9 Aug 2022 20:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279K1OsO031382; Tue, 9 Aug 2022 20:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279K1OU8031381; Tue, 9 Aug 2022 20:01:24 GMT (envelope-from git) Date: Tue, 9 Aug 2022 20:01:24 GMT Message-Id: <202208092001.279K1OU8031381@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: 69a456c0b60b - releng/13.1 - elf_note_prpsinfo: handle more failures from proc_getargv() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 69a456c0b60bb6d1122391e1c78243aec345f36c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075284; 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=gYaA1fR4Xeo5FlIDf4ucM8Pdi2zZ/ZgjD1vXRmVSawk=; b=rpfnMDM0e0oxi5RCTpmGyW4StNeHUSXFzS850+3jk5ln728t1Efri/NHIvjK7hgz0eaOpn Zn02QOWy91ZzeeIGaRDNLVEB+Pa08S9MsKUnldiMAH2YcjKU3gVG6Rf+KasS2nLhZ4OlEJ v0o3+asVMkqicPteEeI0pHrWTy6N+0FLYKHMw7EIi5j4Xqq3Wpyk9P3dV6i6QmL5yUjw15 yaYyXEVGmm2dKXMSzHXbSaR1bTnDfQ+SH0u70qw5qiZ+tWeOpHgx/2GX11abXqxMmb56Ji W3+qaKDf601z71fIjx6YMlkunifXTWkll6Tc9Hd1HMwzOSepf4eEZeR4ienygA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660075284; a=rsa-sha256; cv=none; b=QXPl7MtfFES4OmtTlqFL5Hpo/+X+4dRjZ05+eLUcohtI7ckG7Pq82W6GoPWjsM02s7Q14s bQ/jRoBuzENEOo6+YzPJH6ZzmzhZIOgtzw8hiCswOeYkD///15x1/pdcHZrIntcIW4BKJN NqBPEXkYZHVS32ONIHMiSaHZ600HmRvF8lpxCU31WA5P2MPickuZK5+YetuMoBeEq4O2o5 8rqJH+0dJErkFUtjUxI5km2oVDjiDHrrjguueVQuveuLHopTNxJZWkmLALIRcZLxjoNKQC OXVfJ7VTcRMbPSiRUqLgBFHSgGGUULC7TvQd6KqswpBbOgsiE6qyfNnaJt9ixg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=69a456c0b60bb6d1122391e1c78243aec345f36c commit 69a456c0b60bb6d1122391e1c78243aec345f36c Author: Konstantin Belousov AuthorDate: 2022-06-03 08:21:23 +0000 Commit: Mark Johnston CommitDate: 2022-08-09 20:00:43 +0000 elf_note_prpsinfo: handle more failures from proc_getargv() Resulting sbuf_len() from proc_getargv() might return 0 if user mangled ps_strings enough. Also, sbuf_len() API contract is to return -1 if the buffer overflowed. The later should not occur because get_ps_strings() checks for catenated length, but check for this subtle detail explicitly as well to be more resilent. The end result is that p_comm is used in this situations. Approved by: so Security: FreeBSD-SA-22:09.elf Reported by: Josef 'Jeff' Sipek Reviewed by: delphij, markj admbugs: 988 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35391 (cherry picked from commit 00d17cf342cd9f4f8fd1dcd79c8caec359145532) (cherry picked from commit 8a44a2c644fc6d4ec1740fcc0b3ff01eac989ddf) --- sys/kern/imgact_elf.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index a8f3c6959b3b..5c4a9889a713 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2303,13 +2303,16 @@ __elfN(note_prpsinfo)(void *arg, struct sbuf *sb, size_t *sizep) sizeof(psinfo->pr_psargs), SBUF_FIXEDLEN); error = proc_getargv(curthread, p, &sbarg); PRELE(p); - if (sbuf_finish(&sbarg) == 0) - len = sbuf_len(&sbarg) - 1; - else + if (sbuf_finish(&sbarg) == 0) { + len = sbuf_len(&sbarg); + if (len > 0) + len--; + } else { len = sizeof(psinfo->pr_psargs) - 1; + } sbuf_delete(&sbarg); } - if (error || len == 0) + if (error != 0 || len == 0 || (ssize_t)len == -1) strlcpy(psinfo->pr_psargs, p->p_comm, sizeof(psinfo->pr_psargs)); else {