From nobody Thu May 28 08:27:30 2026 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 4gR03R0504z6fLKN for ; Thu, 28 May 2026 08:27:31 +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 4gR03Q43ctz3sP4 for ; Thu, 28 May 2026 08:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779956850; 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=YhtP969Cu1lHJ49d2Pdd++NKy0OMQf+Wb6B1FxFCqTw=; b=QbMNAtSYsbG4XMGsayF9YobuACpLlJfCIGJUfT8BuhhKnz9LSNTUCcTzELKOA/uqIPOOU1 PdtLKDSK0+0+Q+sL1yF3Q/J5JtjSGHo5WRh/TyUdeoNgYGAoHeoELqo/41pjmGgAEmIL1G /BWtmSHNKrpAB4tQWstBhPoF6jB2RPl9glYsd+yoIU7kBao5igLBZ1TpIG0fo5w/FsWmCL n8E5I/cTHhDFTOi7/WER8onXqFhRLFE8A+QFu7GjXUxDSCXYC7qesF8MjhvvO7oxG8pWdl VuNW146qah75Qd5mLg1BEnq2IX8elB7nkyZp3keu8BGQyO0Hv7K75u3nSvytPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779956850; a=rsa-sha256; cv=none; b=H8doleZhgzlfUbXHbcObT361RTp4T4823VBsHZjUYMLe9wy6kXOMp6xV1WMBSIZxHG7kIF HIp7TdfR9JQI6g8MJzpjSc/0txkt2P2DKEwsqEoLAU4XdX36kyaRkUR2RBxpTqohk0TuPU lUd7fxF0GWgzThRLbIJNP72X2WXhQzjsGLudqlSVo8+6kP66Z9LKwjLzGmBqy8uPtJfeRc HUP7NSlxRGMGbbxj7DKSUF5ZniBA+jCjG3hRZ/f403RiGcSEi56lu+HEUXVh5FmT6ZQAGA ODwbufqFdafBi+HqMaZ4RmaCNy+xt5rIyF3rXmadVSw1yKpIpfAQiqwRAe9ELA== 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=1779956850; 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=YhtP969Cu1lHJ49d2Pdd++NKy0OMQf+Wb6B1FxFCqTw=; b=dEt/by/Jlu31dF7tMpqJSFZ9SRWJp2aKCL+lVGDY32Nmu4sGhrgtWhmPLr25D4/gp+yuMB X/kBwuJrRrJG5hHqa1NEnpOZr+aehr6ki4+FuD/CszPYgVL/ycQlYsQGnA9pfKSBvnGDpk JpUdo68hRQ8Pn1lRiVuBf54uH6croEySOYvu8GJwTxpZV/qiSGu+ktnOieTjV/Ua6/Le+B ukvTZJxSw6xmW1t9+4FUuVW6i9jTSjOd1LhL9JABj1a/TjC5suV8UTG//bBusptf78+ERZ qrZ4Yvq59LCSBsKsjJH+B85k4cIYO3fKpaUqaiw6Um6GplhKXisHqoOWvjLBFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR03Q33YFzf8k for ; Thu, 28 May 2026 08:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 08:27:30 +0000 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=B8rg?=rav Subject: git: 7c11b5f0ecdb - stable/14 - lpd: Avoid buffer overflow when sending a job 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c11b5f0ecdb6e543882fb54ca81da6bc3ac3ebb Auto-Submitted: auto-generated Date: Thu, 28 May 2026 08:27:30 +0000 Message-Id: <6a17fc72.22c33.503ccaae@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7c11b5f0ecdb6e543882fb54ca81da6bc3ac3ebb commit 7c11b5f0ecdb6e543882fb54ca81da6bc3ac3ebb Author: Dag-Erling Smørgrav AuthorDate: 2026-05-25 16:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-28 08:27:12 +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 (cherry picked from commit f2c7c5f94803b67a9a6af625d4fc8882d2afda6c) --- 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 79bc36aef13d..63d0101f6ff0 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -80,8 +80,12 @@ static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95"; /* * 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 @@ -652,7 +656,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); @@ -1139,13 +1143,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') { @@ -1169,8 +1178,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)