From nobody Thu May 28 08:27:31 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 4gR03S1gVsz6fLL1 for ; Thu, 28 May 2026 08:27:32 +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 4gR03R5wSrz3sjN for ; Thu, 28 May 2026 08:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779956851; 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=KovKObKmtiCx01Epfs/xVm9igazM3b8IF8a66yX1EV0=; b=bTqBNiT2+FzTk/UTgI45h6/GHnDEuq+UFqHLYLT51HEosAyM/0xWEoloWI059rViesJsOY nuJ8QOzphgS/MDn6GSr3SiQ4vHuN2EaPmXNrtPq2kaqORBGuDiC3SYZ2L79KzPtPSWwMoX p8L8itgwi4IA1OxbO3owGF/+nS/DCSunkFtj0O7kxc7RCi66PGNYF6YeC/B/WsCioVyP+5 hsgoDkpRXjiJusG/i4LypeIXeXM7AWcwoPxUqsQgOpqE813WwFA2HMGSPWFTVi+dBQTSxz kqMQJwTpmBSPRWstv+iEfiSD4No/8k8sIXz5qQSNnDws37BTRlJgXXPw8cpvmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779956851; a=rsa-sha256; cv=none; b=sY2RhsuG6iRRdYTDU7Qc/7qDV4Qz3qgJiyBSqPyUP6acH3JkFpTPvPy7+7bEOvAun2dAD9 WByz0jj6CQ8vNw7khIymyuaMcI26yzDlS21nD6oqLLvvICzZZwt1bd4dJYlv3fQiQpYx75 6BkddYK7eHDDk41qu7kAwkUKuA/PD4R4+bPTPRV+nN6P4WGxPe0cB2jL2UlKNhq8xtGnKN mjrGes6sVzyCbviNCTF8MUMcDvk+NuHC5F3pHT2IwshfTwNSiDZT1xR+OTgBC2q6bd9K27 jFxqb1zGWRtDwrEXXZhWv2JU54g5pCqQ8tJWtFiukO7lvLWkqhlbdXMHQx+Wvg== 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=1779956851; 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=KovKObKmtiCx01Epfs/xVm9igazM3b8IF8a66yX1EV0=; b=HToADYpaPHLfMNpI0ibLtlxtN6RFChXIn2Ct5f+3LC0rG2DmhzSmiwfAnjy1J8O93aArcM J1jiF6z+14J9RCAUhJO9UOGEZQEOA4AMXgTCtENtgMqH8R5UeT2d2OsZ5zn1mLYBhsFWMB wHENV/g5kPnuBvLU7uG0TMXFM6QcM0gMSD+eHJm0YzeFMG00TlQW5huMoreU/VeCQe/fDq MIsF9KDC6+lKt5Mt+0IPeoLa7WKNZWq/jSwo1ElvJoy35jT1ehcyAYarKIF7mjds8L2BZ/ 7oCCV3fkF8A1fN592e/bYGVdK3/6uCdmI63mkSrVodeJGMmoYmjVlpBFcQPPbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR03R4K5wzf4G for ; Thu, 28 May 2026 08:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 08:27:31 +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: 980ead5949be - stable/14 - lpd: Fix issues reported by clang-analyzer 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: 980ead5949bedcfbc72c57907ff775b030e0cb31 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 08:27:31 +0000 Message-Id: <6a17fc73.22b45.68cb6938@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=980ead5949bedcfbc72c57907ff775b030e0cb31 commit 980ead5949bedcfbc72c57907ff775b030e0cb31 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-25 16:51:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-28 08:27:12 +0000 lpd: Fix issues reported by clang-analyzer Also, unlink our temporary file if we fail to chmod it. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D57185 (cherry picked from commit 0f3e14870906da22a7ca821fb2153d375157cac2) --- usr.sbin/lpr/lpd/printjob.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 63d0101f6ff0..e85cc5dd280e 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -167,7 +167,7 @@ printjob(struct printer *pp) register int i, nitems; off_t pidoff; pid_t printpid; - int errcnt, jobcount, statok, tempfd; + int errcnt, jobcount, tempfd; jobcount = 0; init(pp); /* set up capabilities */ @@ -202,9 +202,6 @@ printjob(struct printer *pp) pp->spool_dir); exit(1); } - statok = stat(pp->lock_file, &stb); - if (statok == 0 && (stb.st_mode & LFM_PRINT_DIS)) - exit(0); /* printing disabled */ umask(S_IWOTH); lfd = open(pp->lock_file, O_WRONLY|O_CREAT|O_EXLOCK|O_NONBLOCK, LOCK_FILE_MODE); @@ -215,12 +212,14 @@ printjob(struct printer *pp) pp->lock_file); exit(1); } - /* - * If the initial call to stat() failed, then lock_file will have - * been created by open(). Update &stb to match that new file. - */ - if (statok != 0) - statok = stat(pp->lock_file, &stb); + if (fstat(lfd, &stb) != 0) { + syslog(LOG_ERR, "%s: fstat(%s): %m", pp->printer, + pp->lock_file); + exit(1); + } + if ((stb.st_mode & LFM_PRINT_DIS) != 0) { + exit(0); /* printing disabled */ + } /* turn off non-blocking mode (was turned on for lock effects only) */ if (fcntl(lfd, F_SETFL, 0) < 0) { syslog(LOG_ERR, "%s: fcntl(%s): %m", pp->printer, @@ -231,8 +230,7 @@ printjob(struct printer *pp) /* * write process id for others to know */ - sprintf(line, "%u\n", printpid); - pidoff = i = strlen(line); + pidoff = i = snprintf(line, sizeof(line), "%u\n", printpid); if (write(lfd, line, i) != i) { syslog(LOG_ERR, "%s: write(%s): %m", pp->printer, pp->lock_file); @@ -260,9 +258,10 @@ printjob(struct printer *pp) tempstderr); exit(1); } - if ((i = fchmod(tempfd, 0664)) == -1) { + if (fchmod(tempfd, 0664) == -1) { syslog(LOG_ERR, "%s: fchmod(%s): %m", pp->printer, tempstderr); + (void) unlink(tempstderr); exit(1); } /* lpd doesn't need it to be open, it just needs it to exist */ @@ -374,15 +373,18 @@ again: goto again; } -char fonts[4][50]; /* fonts for troff */ +char fonts[4][64]; /* fonts for troff */ -char ifonts[4][40] = { +char ifonts[4][64] = { _PATH_VFONTR, _PATH_VFONTI, _PATH_VFONTB, _PATH_VFONTS, }; +_Static_assert(sizeof(fonts) == sizeof(ifonts), "fonts != ifonts"); +_Static_assert(sizeof(fonts[0]) == sizeof(ifonts[0]), "fonts[0] != ifonts[0]"); + /* * The remaining part is the reading of the control file (cf) * and performing the various actions. @@ -406,10 +408,9 @@ printit(struct printer *pp, char *file) /* * Reset troff fonts. */ - for (i = 0; i < 4; i++) - strcpy(fonts[i], ifonts[i]); + memcpy(fonts, ifonts, sizeof(fonts)); sprintf(&width[2], "%ld", pp->page_width); - strcpy(indent+2, "0"); + strcpy(indent, "-i0"); /* initialize job-specific count of datafiles processed */ job_dfcnt = 0; @@ -957,7 +958,7 @@ sendit(struct printer *pp, char *file) strlcpy(indent+2, line + 1, sizeof(indent) - 2); } else if (line[0] >= 'a' && line[0] <= 'z') { dfcopies = 1; - strcpy(last, line); + memcpy(last, line, sizeof(last)); while ((i = get_line(cfp)) != 0) { if (strcmp(last, line) != 0) break;