From nobody Sun Dec 22 07:49:59 2024 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 4YGCx357Qkz5jDGf; Sun, 22 Dec 2024 07:49:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGCx33NmCz4hQ7; Sun, 22 Dec 2024 07:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734853799; 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=6S0RqYHRL61kASaIYmY4j7r6qdu6tQ97Ue8uBX4J4kE=; b=YRkUkFkE8QBN3OA0gpqMGxe++PbvEWLVzGK3MyJFjlx/wxTg/hY7JeDXzA1hl9Tcwmg0bA WtSSsYr+uqT5xpHdWcNbouLUFoM1wCVESUDF43DY1HZ2zxeWg3gTrpACdtfZQUlw/JaLTh dira33BLJnZrXwxr57H6GFwjCcPl9J6FsxNY/nuPHODjYvYxMcic+wBgjlOfFWzVcfrU1u V6wzw6TO39jp6elyBlI52D6qf+HNld9zhGX8rWVe2T8yB8+KD3UpDgr3swCdn9AQTSuD70 OnZBKTo1J5tHobksrQpX2/830J8E73whTuFb2bdBxfCblViNkcl1BrifStfCzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734853799; 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=6S0RqYHRL61kASaIYmY4j7r6qdu6tQ97Ue8uBX4J4kE=; b=MZxXyGK7bBOvzMuIZydvcwp3Xuuz0w+ciLrnaO2rfWenbk55RwHNna2d5heEk4jHmR6LNB RCWK3jld317imKKxOpVbZ4p3OtSLi5/PESZnGWfhHI/I6hSeKF4RuGsvnONATpxJQuB9Ip IhW0EHFgIs3exVEM4Hgp/1lYptLtfkM+7GIBJQ7MiKeGDIpXHShzVS8KsLxoEHQpW7wlS1 2utAu6Evf9y7v/SlD+R54msiLUGR1u4HAMTnhvgGzgfDAgCZGeOjw4EkvOdwsLrg9q54Yf jur0IQY4o944o0RZxY4oGR+k3U8sdmx+KLoXyGxAUn+biDhMa8blZ63eoV5nvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734853799; a=rsa-sha256; cv=none; b=WyN/+0cNq6Siii8mSVFyWDdasFzLs7E+xDRSLlMa4cKDCpOcRPGwc33gRkvbNRS9aaWjAO bmKFDPcKVc5uoQ3T13k0OJCjopbLsJltMiL9EoYX4lpPvvDtn9MF0dEx4eghgZjV6wL1RA DlQTLO+VMJsBc9uHra/yoRwB73vPmiba/TPDRTUyWRX9IkB05GvVypSyYdR/7xRsbJhlgB n3pJzVOmoPUgTw0ZyOqn1RtOMCqXMHCCy5pJhXVr5vfrW7ZT3XnYy2nCJyu0f/UUYfaG2X 3NSq8MVrVWDxNYmLKpQwT0l/WDVyLNTIiLpU9q2riIrbq9obVCNCZ+7eTNqnDQ== 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 4YGCx32qYcz10Yp; Sun, 22 Dec 2024 07:49:59 +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 4BM7nx4n023812; Sun, 22 Dec 2024 07:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BM7nxlR023809; Sun, 22 Dec 2024 07:49:59 GMT (envelope-from git) Date: Sun, 22 Dec 2024 07:49:59 GMT Message-Id: <202412220749.4BM7nxlR023809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 4f20dec1bf17 - stable/13 - MFC: tail: Do not trust st_size if it equals zero. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f20dec1bf177408ef04969e5ac0f3523cd6df07 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4f20dec1bf177408ef04969e5ac0f3523cd6df07 commit 4f20dec1bf177408ef04969e5ac0f3523cd6df07 Author: Ricardo Branco AuthorDate: 2024-01-03 20:32:47 +0000 Commit: Xin LI CommitDate: 2024-12-22 07:49:51 +0000 MFC: tail: Do not trust st_size if it equals zero. PR: bin/276107 (cherry picked from commit 1fb3caee72241b9b4dacbfb0109c972a86d4401f) --- usr.bin/tail/forward.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 2edf8730e8b1..afbff43e6063 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -105,7 +105,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp) case FBYTES: if (off == 0) break; - if (S_ISREG(sbp->st_mode)) { + if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) { if (sbp->st_size < off) off = sbp->st_size; if (fseeko(fp, off, SEEK_SET) == -1) { @@ -137,7 +137,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp) } break; case RBYTES: - if (S_ISREG(sbp->st_mode)) { + if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) { if (sbp->st_size >= off && fseeko(fp, -off, SEEK_END) == -1) { ierr(fn); @@ -154,7 +154,7 @@ forward(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp) return; break; case RLINES: - if (S_ISREG(sbp->st_mode)) + if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) if (!off) { if (fseeko(fp, (off_t)0, SEEK_END) == -1) { ierr(fn);