From nobody Mon May 25 17:03:06 2026 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 4gPMdl2xgqz6fXrZ for ; Mon, 25 May 2026 17:03:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gPMdl09Knz442s for ; Mon, 25 May 2026 17:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779728587; 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=Mczp5n01XoC8le0kjPjFpd9X89HwxRvWG2xrsTc1tiE=; b=Kfu0z4oksvpWWp0DYur2qQK15Ad8c3DaBy697xnklekJfMpa4razG3IX6u1SIudHXCMx69 M9PykE3LXadTvEQfpwg+74HRBBRHIfqhqIka1aVPwOB00YJYg4d7lfjJ/zmyad1S9VDRHZ X/TGwP3YHyYjqFYkcBhq99H3kmHYzbes80inSuu+k6PQlfGPpU6MAFiQZ2FB8tmmncSSl2 eDjcmVsIM3YB34I/3ZGZ0aaHOQ9B8BWjYigrbeHrwFbEDDglk1ZYpZGhC4pLkEj7Rq1szH Ny9Grz+wbShoulV2Aw4Yp8NVH/4tsRNJG63Py2dBoblqhZ7tLoP4RHjIi4lS+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779728587; a=rsa-sha256; cv=none; b=eIx2S6A7PA+5W+md50O8A2TtlNNtMBKBwyAmQoWLquRkbuYtAWi1NEb4OQTN9/a5n2m5k1 CRd31bYQKl/BR6wRmFgUeLeqaRLbI25H/enf/42YYgF4nNwdZHJvSZiSsuzBvm2fKag0Y2 7xH1Ywnwm6kGE96Q6YJGivpL028Rwz+NL5D71rcp4p8AmhJChr3cILdV4HBPbKSDUfP+sD FKal2FHbduto2qUFM3nFNWo34L57BaT06uUZ5W1dYqTkAXrNEMxZ6c9M/YGiNA0BYNlLit B9/toCXWLZmpDZ1xyZtxlz+7ja+NCQfRlEl8pEwTJ7UNZMH3LtTvM90j+CRiTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779728587; 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=Mczp5n01XoC8le0kjPjFpd9X89HwxRvWG2xrsTc1tiE=; b=QZ08s23vyaC1/ssFty18C+tLsUog0RFo/qdXdEFhxnj4jBJOZzuRMqvdeU++a0D6uMI44b hPalcFV7XdoQ4B7l971D8POr5ahQFIjNvTADUnkIcB7k0N2h/Ea4SfsA7QK08RJ7zg2thl /JDnhjDNH1xiGxSTJkxna6CZs7cJfn43m8VYzdWlwRrKusMyShCVkFUPz3hbr3lEwmxQuV VzKQLPJkG8mceg0pQkyDAQ2KuGcNJomVKtQHIWEXXIdDY68vcatzXxrSxKoX13+bo5unWV UvlBCCxs7GUtG1bQhja+yRedj+Gd8actt7XnHFscuGK2YsS0BDZ4BS4h81rkqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPMdk6pnvzqND for ; Mon, 25 May 2026 17:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 382ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 25 May 2026 17:03:06 +0000 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=B8rg?=rav Subject: git: f2c7c5f94803 - main - lpd: Avoid buffer overflow when sending a job 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: f2c7c5f94803b67a9a6af625d4fc8882d2afda6c Auto-Submitted: auto-generated Date: Mon, 25 May 2026 17:03:06 +0000 Message-Id: <6a1480ca.382ec.4d1bc28@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f2c7c5f94803b67a9a6af625d4fc8882d2afda6c commit f2c7c5f94803b67a9a6af625d4fc8882d2afda6c Author: Dag-Erling Smørgrav AuthorDate: 2026-05-25 16:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-25 16:52:16 +0000 lpd: Avoid buffer overflow when sending a job When forwarding a print job to a remote server, we could overflow the command buffer if a control or data file had a very long name. MFC after: 1 week Reported by: Joshua Rogers Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57184 --- usr.sbin/lpr/lpd/printjob.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 1c6736097492..0e86e8de8fb9 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -68,8 +68,12 @@ /* * The buffer size to use when reading/writing spool files. + * This is also used to compose commands for remote servers and therefore + * needs to be able to fit the longest command we could possibly send. */ -#define SPL_BUFSIZ BUFSIZ +#define SPL_BUFSIZ (BUFSIZ * 2) +_Static_assert(SPL_BUFSIZ > sizeof("x18446744073709551615 ") + PATH_MAX + + sizeof("_c2147483647 "), "SPL_BUFSIZ is too short"); /* * Error tokens @@ -640,7 +644,7 @@ print(struct printer *pp, int format, char *file) if (pp->filters[LPF_INPUT] == NULL && (format == 'f' || format == 'l' || format == 'o')) { pp->tof = 0; - while ((n = read(fi, buf, SPL_BUFSIZ)) > 0) + while ((n = read(fi, buf, sizeof(buf))) > 0) if (write(ofd, buf, n) != n) { (void) close(fi); return (REPRINT); @@ -1127,13 +1131,18 @@ sendfile(struct printer *pp, int type, char *file, char format, int copyreq) sendagain: copycnt++; - if (copycnt < 2) - (void) sprintf(buf, "%c%" PRId64 " %s\n", type, stb.st_size, - file); - else - (void) sprintf(buf, "%c%" PRId64 " %s_c%d\n", type, stb.st_size, - file, copycnt); - amt = strlen(buf); + if (copycnt < 2) { + amt = snprintf(buf, sizeof(buf), "%c%" PRId64 " %s\n", + type, stb.st_size, file); + } else { + amt = snprintf(buf, sizeof(buf), "%c%" PRId64 " %s_c%d\n", + type, stb.st_size, file, copycnt); + } + if (amt >= sizeof(buf)) { + syslog(LOG_ERR, "%s: file name too long", file); + sfres = ERROR; + goto return_sfres; + } for (i = 0; ; i++) { if (write(pfd, buf, amt) != amt || (resp = response(pp)) < 0 || resp == '\1') { @@ -1157,8 +1166,8 @@ sendagain: */ if (type == '\3') trstat_init(pp, file, job_dfcnt); - for (i = 0; i < stb.st_size; i += SPL_BUFSIZ) { - amt = SPL_BUFSIZ; + for (i = 0; i < stb.st_size; i += sizeof(buf)) { + amt = sizeof(buf); if (i + amt > stb.st_size) amt = stb.st_size - i; if (sizerr == 0 && read(sfd, buf, amt) != amt)