From nobody Mon Oct 20 16:11:44 2025 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 4cr0md1b6Sz6CgSY; Mon, 20 Oct 2025 16:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0mc3stHz3VWZ; Mon, 20 Oct 2025 16:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976704; 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=tU0/wSWSspPnu3cLI303SvXvStFXflgealSF/zVCAFY=; b=MsgQL1eXDccpeDCvoWOF1cG31iDU6UwZbfpFcFqS2AjTxdEuY26CzOz1VpeAw4dHm5FHgg 0kst9lQiMYdscDdGzcIq9PlANd1+mgx5XzrLs7z7idDqEWT5BlRIPC5tfTmrIRz0MTzQ3/ V9LW3q5HcYvTlm+tEtjK/KnHM7qeKQz7/QHEiVH8iNCRceeMrxmkLBkzr6v8uscQY/bbpv Pjsiat7WKqC19iv157DUwX0eU6YbGY18DCYh0J5Fo45kqsUyBuhdORG+oUqU7U+htVvTQF VxfxYvBhDeQsZws1yJgU8NDvApQPTQPBxj9zfz/wQPvWLL5OvXssACjl36RbZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976704; 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=tU0/wSWSspPnu3cLI303SvXvStFXflgealSF/zVCAFY=; b=GeArjq3rg6im7ZB+Q8Xrx+nGRWcvEo8PT4VndY3uewZKvGuOtrvedNe4RAG1TFL/3orU3U 4tHhAnAzQV66iRvU8m447jA+ZbvmO1fc4XGJEl6y6g0uAcCi+/kLmp3Kcj8p7pHMwFEox/ gyROK6dniYrU+TP2TvVTb99tpDL8YxMQMyr9ueo4SSv8fWdWIsmMfHt17n4WCzIt+M0SBc DyMMlCO586Mk6Rufm+3GafnNbrneRcDr0bxMivj4qzp6UiS42OcpU5NZDxx7rsWMsb5q/h /Gtb4eDEkOGsEkT+Xr69oltPquo33wSUwyvTNQy0WChktEfMv9wM/9bdQVrKWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976704; a=rsa-sha256; cv=none; b=PglBhFrgmaljNs2YHfnJSRY1h+uzX/ZovpBVkpUEWNPzT/7ciTW2yEWOroakr12jfkzB3L tnC2NEa45/kutWxueUiRKDWkbysuygxfl8umLSUtgcq2aJBWYPsJa2+0OBzRkyXoiXjaA3 b10shbOovp+7y8OTkrPCUyFldL06UAgAQw4fGNjJdmgx8mbuu7j7J86AHmVFWzkwgtxJWs ozliStmzd847n4dpScSxXCBmZUOC+fHhWXqKrNv6WIa2rkm0EXrGM8zzy3RnXxf7Nx04O2 uJpfdFDCjWV8OjPQt26Q0wBVj6LCsIVo3g5UAhdKlNuJkUhzSjHh3B/KWcW+UA== 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 4cr0mc3Ldcz4Zb; Mon, 20 Oct 2025 16:11:44 +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 59KGBilb039375; Mon, 20 Oct 2025 16:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGBiDt039368; Mon, 20 Oct 2025 16:11:44 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:11:44 GMT Message-Id: <202510201611.59KGBiDt039368@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: edeff9b3f5ef - stable/14 - quot: Fix benign buffer overflow 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 commit edeff9b3f5ef5a7e926c1cda87d3da6c40e80ab6 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 16:11:34 +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 27f0c1ee0068..7a7362dea996 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -281,14 +281,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");