From nobody Mon Oct 20 16:11:35 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 4cr0mT0mGdz6Cgn7; Mon, 20 Oct 2025 16:11:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mS0PrSz3VPx; Mon, 20 Oct 2025 16:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976696; 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=C4ItJzLcr0BFqw6OS6wltyjvQu/GMcbHti35Mnz0Azg=; b=BIuWTeOPG4vz9UhnezQcvcDitraqhntglRESbDgSTEXKfzeku/3Z9nSuVvmHWpgnbS3x4u Da+JkoCkktxEvCw/A4cKsdria496A2AEvlZi5opsEEScHacfbNG+pibrZ1CJwf/RlzIPO8 zCkXnqxrKiROD8BpXDFOoDf9GCI97UK/00YF8Z3TTLGC5bXjD7Ub32tSl+aI6/hpOUnTj4 V1pG1CKo3eHmODba07LoH36Ybx/qgCOlYamPWJ42apwl6cE9VFFhhMGk/NANVFUPt4RkYt P99hg5aIrj1m5iDnBAyLPIuAtdTKvulXide8w0g1muOkw4nJduvk4qT77mrQ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976696; 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=C4ItJzLcr0BFqw6OS6wltyjvQu/GMcbHti35Mnz0Azg=; b=MNTDeCZdjLOH93XXVpoj63Smu74NDdU4tQXvfBDxmmrLk46bD3h5KXwRO6Rc4FZgp8upOU U9HVfp8MUdZA1bt1gfNaLfx9W7FFX9jmMP8Pzkvv+7tuPTfph9MknXc/OflzzxZpppou+E gxwQJ9EVdRVIA8Sk7zo5izTeZkONLQ79FPBIo0NMcttqhaXEAOeimttfgcpCchLu5We66n NjOEaLvEpaTAp8C15U4nOfcHhjf4iJm4/nr4mNLfZGmi6cWhUBWpa3Yl/LWABxEROKd40w 2NzZqLxZi+IcSWh9eyJ3Kkq7mM0VLoMjUFBMYTCyB2h/DdEA/SGTAOQ1fARpmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976696; a=rsa-sha256; cv=none; b=ocsEnnPTj037FLlr4Rvkz2HVSO/VSZI5f6gjdqStCtOkNE2+fkDQRFiCjxK89POT1Bip8i IB6oVenxVMUeQER/T2bP5RiRiSGuA+UCz3DeMTnkDJZLQ/ygADp8MnyuiS4Erh5wHQJfL9 8l2l37lW7aulflXkON12Jj6G70vWPji3PiFRuh1Kq2CnNlxjzleXuHrJF3kK9uB7AiXv7f ZPfjHdt8dyjxKQ0E87gGpKLn3vUwbC57GfzloPrm/m1UzPXfeF4swYKSAubtfkbsG3WeyC AWLIQkrm4brKcPYC7wErauRxuiLBblTaaxyyjv49HlPqCv/lFWfkWuO6wsAH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cr0mR73CRz4y9; Mon, 20 Oct 2025 16:11:35 +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 59KGBZt0036302; Mon, 20 Oct 2025 16:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBZ3T036299; Mon, 20 Oct 2025 16:11:35 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:35 GMT Message-Id: <202510201611.59KGBZ3T036299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3d680881f6ed - stable/15 - quot: Fix benign buffer overflow 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d680881f6ed2f55079aac26cf0ded307c282563 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d680881f6ed2f55079aac26cf0ded307c282563 commit 3d680881f6ed2f55079aac26cf0ded307c282563 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:21 +0000 quot: Fix benign buffer overflow If it encounters an inode whose owner does not have a pw entry, quot allocates a 7-byte buffer (8 in practice, since that is the minimum allocation size) and uses it to store the numeric uid preceded by a hash character. This will overflow the allocated buffer if the UID exceeds 6 decimal digits. Avoid this by using asprintf() instead. While here, simplify the common case as well using strdup(). Reported by: Igor Gabriel Sousa e Souza MFC after: 3 days Reviewed by: obiwac, emaste Differential Revision: https://reviews.freebsd.org/D53129 (cherry picked from commit 5854d1cbab1073d78519e7ad9a6eb5726341d587) --- usr.sbin/quot/quot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 4152c498371a..c11c46a500a1 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -280,14 +280,10 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { - if ((usr->name = (char *)malloc(7))) - sprintf(usr->name,"#%d",uid); + asprintf(&usr->name, "#%u", uid); } else { - if ((usr->name = (char *) - malloc(strlen(pwd->pw_name) + 1))) - strcpy(usr->name,pwd->pw_name); + usr->name = strdup(pwd->pw_name); } if (!usr->name) errx(1, "allocate users");