From owner-svn-src-all@freebsd.org Fri Aug 28 16:40:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD1EF3B7277; Fri, 28 Aug 2020 16:40:39 +0000 (UTC) (envelope-from gjb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdQMC3833z3bJk; Fri, 28 Aug 2020 16:40:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E59717DBC; Fri, 28 Aug 2020 16:40:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07SGedXg058161; Fri, 28 Aug 2020 16:40:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07SGedQU058160; Fri, 28 Aug 2020 16:40:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202008281640.07SGedQU058160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 28 Aug 2020 16:40:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364921 - in stable: 11/usr.sbin/fifolog/lib 12/usr.sbin/fifolog/lib X-SVN-Group: stable-12 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable: 11/usr.sbin/fifolog/lib 12/usr.sbin/fifolog/lib X-SVN-Commit-Revision: 364921 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 16:40:39 -0000 Author: gjb Date: Fri Aug 28 16:40:38 2020 New Revision: 364921 URL: https://svnweb.freebsd.org/changeset/base/364921 Log: MFC r362718 (adrian): [fifolog] wrap the recno when we hit the end of the provided file size. Without this the log just keeps growing to infinity. Reported by: phk Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/12/usr.sbin/fifolog/lib/fifolog_write_poll.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/usr.sbin/fifolog/lib/fifolog_write_poll.c Directory Properties: stable/11/ (props changed) Modified: stable/12/usr.sbin/fifolog/lib/fifolog_write_poll.c ============================================================================== --- stable/12/usr.sbin/fifolog/lib/fifolog_write_poll.c Fri Aug 28 16:40:33 2020 (r364920) +++ stable/12/usr.sbin/fifolog/lib/fifolog_write_poll.c Fri Aug 28 16:40:38 2020 (r364921) @@ -239,6 +239,14 @@ fifolog_write_output(struct fifolog_writer *f, int fl, */ f->seq++; f->recno++; + + /* + * Ensure we wrap recno once we hit the file size (in records.) + */ + if (f->recno >= f->ff->logsize) + /* recno 0 is header; skip */ + f->recno = 1; + f->flag = 0; memset(f->obuf, 0, f->obufsize);