From nobody Tue Aug 9 19:58:54 2022 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 4M2P5p64GCz3j7Vd; Tue, 9 Aug 2022 19:58:54 +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 4M2P5p5Tqsz3hD4; Tue, 9 Aug 2022 19:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075134; 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=gsNcXgrKVUDP/jUcfaNdyZmcqm8amlzQvOAMvMO2zWw=; b=EFFxgeD32FG/M9Q/wnzla+w/R/RGYgliAoJPbMIUbCvIJ40BLBhsnSblhm5AujJ3cnXHub QcCgXwvC/9KhVfBBwEB3KNACpko6ITUpItBpXLHeHGWKdHxOZgO8wfpPEQFVmdUzwaUAC5 Adaaxq9aO8ABF5sb6FpTSovHn5tfctbf6z+bqcUXTcOF1hxeCSnTtOKXlsOlqpiDwedniU j9fxERN4q7GC+iIm0GgVK7Zt26svcnP1F11Nf3uoY4i4+8BAXGxLljtj0BWiYnYiBFMXB1 qNRx6OxAlz4wJEeuO6CgxO+ishfMfSBfUXFgDaHHVjks5vO8Q0AmtXG27UIufw== 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 4M2P5p4ZwKzkcm; Tue, 9 Aug 2022 19:58:54 +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 279JwsHa021443; Tue, 9 Aug 2022 19:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279JwsA7021442; Tue, 9 Aug 2022 19:58:54 GMT (envelope-from git) Date: Tue, 9 Aug 2022 19:58:54 GMT Message-Id: <202208091958.279JwsA7021442@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: 0aa6d8576d9e - releng/12.3 - elf_note_prpsinfo: handle more failures from proc_getargv() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 0aa6d8576d9e7e4463323b82b7dac178f56237e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075134; 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=gsNcXgrKVUDP/jUcfaNdyZmcqm8amlzQvOAMvMO2zWw=; b=psxQlN3EkE99V4jdTjO25fbNPlKEtsY4Xdp2mz9oDeewonprwEio7dYiQRr7rOHQBFv6Dn rngkvTl4UQthLCF+NCDeM8v2rAbTYj+jv7b/LuWLhXIByBTyklLdeC35D624TWMv4JvYhx j7tjFZ6oX//FOnScJIWGj+UOBODMXwj9PBEbxjGAv4Ub/CSZHx1lys5jlcNlXROkscxNOT 8UzPYuHtal82TAC70MEoUVajhTZbGUyTVlHkIMbzXmjz8Obigs9lW0NF708baj+KJq9zWe 76i+RZ7oLH1vU9Pu/w7yRBe+U75x+cm9n6wfGyU9Meks/ud1wZZk95NshpczEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660075134; a=rsa-sha256; cv=none; b=yBqhbGN/jm5lOPVqbFz4yITBAjimneF7+PNco+nzP2tYqxsmjlPt8UfmN25uBmWl++CwpN pgJc3Zo2p3fKglF0aEYC6+dtpjz8HqmDSaL/0Rxve30wQYeS587AGpmnPuVP/OG2sitIi+ EFywFseth7NI6PuWsCQd0BZS2FYDOd8gHL/BqcRRUpaowG80v8NN5CYifZB/0sMeCPcZYE Q0n3lVffq7xLP+WI7Lsj03MBw3vYEjlHPtBw6G2tWrQ6NEEOaG728KzT7OgW+TamI5meWZ 6+CgnnUwatct+H8T6hvB7on0haN3anO7G/+8yeDV0s2mon+S94i4n60u4fARxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa6d8576d9e7e4463323b82b7dac178f56237e0 commit 0aa6d8576d9e7e4463323b82b7dac178f56237e0 Author: Konstantin Belousov AuthorDate: 2022-06-03 08:21:23 +0000 Commit: Mark Johnston CommitDate: 2022-08-09 19:57:10 +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 2170511d491b65a07dc4416ecda2fbb37349aa10) --- 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 416de09630ae..b301e9a499ec 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2149,13 +2149,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 {