From nobody Tue Aug 9 19:56:44 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 4M2P3K0qFcz3j7Tk; Tue, 9 Aug 2022 19:56:45 +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 4M2P3K0FFKz3fv5; Tue, 9 Aug 2022 19:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075005; 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=WhbpqpKxpLEQ6m+BlCo9NpMvRjlNN8kdY3Q3Z3dkBKo=; b=iFGJ+Z3r82mdj0C7vbceAPDwXUj8tOWdTzDw9Pl9D2MNfdlDNCFQaGR8G9XiNHvfUxsID8 GdPa2ccmovAWnZQZYGHViCp1Cl8i83mG3lkAf6Q4JB/3a79SpYPMhLMS2XtYl7mYzgXJ1F QvRPhTVviib6LYsdIF5ciiH+KO8gRqi+95ajoDrAZJp9LHIJ0uUNVRtadzHZUvHnKFxpkv OYH3JVrRXcSTbKoC0LxnOaIGjqO5pgD5wF9L6BNCeRDuwJhTTvEEDOInLsMS3VYkhI80wN cJ0+THC/VLqc67Sz1m2MwX7wymOT0H8E9Ylefe8UqHOyyB9fceeay8CTNv7uBg== 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 4M2P3J69mBzkJT; Tue, 9 Aug 2022 19:56:44 +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 279JuiY5020929; Tue, 9 Aug 2022 19:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279JuitQ020928; Tue, 9 Aug 2022 19:56:44 GMT (envelope-from git) Date: Tue, 9 Aug 2022 19:56:44 GMT Message-Id: <202208091956.279JuitQ020928@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: 8a44a2c644fc - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a44a2c644fc6d4ec1740fcc0b3ff01eac989ddf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075005; 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=WhbpqpKxpLEQ6m+BlCo9NpMvRjlNN8kdY3Q3Z3dkBKo=; b=iUBAqv1UxJNU5awjVhgsMhVTqVbnE+P+L56YSsvw3IK0VfA6211HkB9Ga+CxqgKT4zkd2s yHqvI48v+c0gTW37BBpryKPOO4LmELIfmq8Ep4VAK5FUShAludCyCkKkPVTz/KxiVDHLE7 05lauWvY4WKP0tvafMOD9RCEG2IRG5vsiR22DKDpkhNZufjLKI42wSTIZtyz6554AmBTTm LhJybQk04gcflSUP38/1lkuWh3bTf2GhRkxslbfQveh8BVMYdbBU5OtfjypIBuQIzHGfFo 9L1fMjzx8QYm0vHzkS4PyxGbH4rmBn8c6AhYx2S0cir2whX7Rd0Kb3Yqfxistg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660075005; a=rsa-sha256; cv=none; b=ie7HuhqMewBTz3SMmLYLCWyeI1MKWG4yx7v24IGnpEzgEezcqnIyGRi1DxFVwbkioorUyc EmV0Lbi/wBGauEqOUto8pk5VEmN2y8tgJLvYc7ZDUH6tMlapUjSrxItu870hUphVQn3Weo q6B7Dw/4l+xlV3JSvi8vNmBF51MU9NGDOhz4IMR//9ABwPzqL3CBIFsyseRNO42DwIusnU P3hJ+TvR9YSeSqGcKVHZTjEzd6ktXAK/FeilkjKkiha+sm51MqKxNBthBVa5dPU2GBTn28 NhyJgGq2me67VGHqwpraPRuKcp9B01xyrzJDJUhn0vP/3wLBX+saQ9kez7xNaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8a44a2c644fc6d4ec1740fcc0b3ff01eac989ddf commit 8a44a2c644fc6d4ec1740fcc0b3ff01eac989ddf Author: Konstantin Belousov AuthorDate: 2022-06-03 08:21:23 +0000 Commit: Mark Johnston CommitDate: 2022-08-09 19:47:32 +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) --- sys/compat/linux/linux_elf.c | 9 ++++++--- sys/kern/imgact_elf.c | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/compat/linux/linux_elf.c b/sys/compat/linux/linux_elf.c index bcbd4d1cad51..b02b6e2cc777 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -155,13 +155,16 @@ __linuxN(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) + if (sbuf_finish(&sbarg) == 0) { len = sbuf_len(&sbarg) - 1; - else + 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 { diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index bee3524537d9..11ab46767fce 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2189,13 +2189,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 {