From nobody Fri Oct 17 11:55:21 2025 X-Original-To: dev-commits-src-main@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 4cp3D966bSz6D9sK; Fri, 17 Oct 2025 11:55:21 +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 4cp3D95f9lz3Phh; Fri, 17 Oct 2025 11:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760702121; 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=LmEYVfNTbPz++xfcv5mxECD/RNwgguTlB8hUypg5Tmg=; b=E96N0WFCa/SWhVpAbsUcp9C9XLTR0u3xMI2yH1VWTIwNB/HltBSs9PrxMtXRCUjeUzlbw3 27ubheC2LM77SOXw4RTtW3kXWdJ0z/Hk23Oa9o6x6+GD0LISfZBFFReMUcvSNVq++4lG1c pZWPN2QpIgVceSM2SALtgC1aGSGdq0CAWp7KYG47RQ/WHxsAAXomDkKDRo63XdEBtWW/ZO 9/eKTlnQPJBsWjH0DVEWWB1zIf6OBrDEInTWoY24O8awAnO9sFopraCP9/zrN9O8d2TF30 VQU1IYDwp//FtIm3C/lKZ+nO6IWbTzaIoGLg09MgLpreyOxUjBmCpV+leYrrgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760702121; 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=LmEYVfNTbPz++xfcv5mxECD/RNwgguTlB8hUypg5Tmg=; b=oqB1DQQLfWY1bzbk4havMBovOe/bWO9NBsKZjn8/QrE/xE6quc5M9s2J4NsXEEub+oHVEK 47BOuACVBtA9ILh4p7dEVEcPLlNRKL2la2tpIcCg1coZ4usSIbW4SkSOvRLVyqjoO3x9Q3 aTDftIMk76yuzwi0kZFitZFWHibWOZExQnKmRQiYEzc6jh7NiOVxTyBnzz309hCn+qBw9q iv8458K2eEEKQXQnIqgmZwYMXLN5wsH/uzq2ekyvlkX8WeBHUoAjaJkhr3B2b3LSaCYLtw mCq9n7mNc3u2blWlauQGWTRfRX0/zWHGbjwj6s/jOEwWW8VGlSEhxooIj/nz8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760702121; a=rsa-sha256; cv=none; b=p1MYCz2RKO0X+WvhTcXTMT98iT4umWrTD/irUqvPw9LJ/nXPbWGeLIai6+Bg5nuA0wbQfY D25aGk2m/3rgDE5m8jNmeuNFcDhvD3Mw8EmatH7+TxDVAzf3FPFFH5KtCVUBpRvkAd0JSU hje0ufJKNiwfdAX3o/+mVW7ggwWLD4diHv5y2t5jpfEyXljsly+C3PvWf2mR2alcjiCHJe g9aVLmAPcE+clPFLixPQjD42U0UAZ9uTjDxe1yjEpbI0jwA3MWDoHq4GMfcPouvZUF7K6D ssUFTLMcE6HUP3AHklroDRLwOdbY9Zu+o+L8U+5iDnfRS2nRiYtz+FN3LHNPBg== 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 4cp3D95BQDzthK; Fri, 17 Oct 2025 11:55:21 +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 59HBtLgP004622; Fri, 17 Oct 2025 11:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59HBtLTm004619; Fri, 17 Oct 2025 11:55:21 GMT (envelope-from git) Date: Fri, 17 Oct 2025 11:55:21 GMT Message-Id: <202510171155.59HBtLTm004619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 5854d1cbab10 - main - quot: Fix benign buffer overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5854d1cbab1073d78519e7ad9a6eb5726341d587 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5854d1cbab1073d78519e7ad9a6eb5726341d587 commit 5854d1cbab1073d78519e7ad9a6eb5726341d587 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:54:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-17 11:54:48 +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 --- 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");