From owner-svn-src-head@freebsd.org  Thu Oct  8 18:29:17 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C409342E8CB;
 Thu,  8 Oct 2020 18:29:17 +0000 (UTC)
 (envelope-from mhorne@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 4C6fqd4npPz4M9t;
 Thu,  8 Oct 2020 18:29:17 +0000 (UTC)
 (envelope-from mhorne@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 89386CF2D;
 Thu,  8 Oct 2020 18:29:17 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 098ITHkj065742;
 Thu, 8 Oct 2020 18:29:17 GMT (envelope-from mhorne@FreeBSD.org)
Received: (from mhorne@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 098ITHNE065741;
 Thu, 8 Oct 2020 18:29:17 GMT (envelope-from mhorne@FreeBSD.org)
Message-Id: <202010081829.098ITHNE065741@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mhorne set sender to
 mhorne@FreeBSD.org using -f
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Thu, 8 Oct 2020 18:29:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r366543 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mhorne
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 366543
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2020 18:29:17 -0000

Author: mhorne
Date: Thu Oct  8 18:29:17 2020
New Revision: 366543
URL: https://svnweb.freebsd.org/changeset/base/366543

Log:
  Fix a loop condition
  
  The correct way to identify the end of the metadata is two adjacent
  entries set to zero/MODINFO_END. I made a typo and this was checking the
  first entry twice.
  
  Reported by:	rpokala
  Sponsored by:	NetApp, Inc.
  Sponsored by:	Klara, Inc.

Modified:
  head/sys/kern/subr_module.c

Modified: head/sys/kern/subr_module.c
==============================================================================
--- head/sys/kern/subr_module.c	Thu Oct  8 18:02:05 2020	(r366542)
+++ head/sys/kern/subr_module.c	Thu Oct  8 18:29:17 2020	(r366543)
@@ -496,7 +496,7 @@ preload_dump_internal(struct sbuf *sbp)
 	 */
 	bptr = (uint32_t *)preload_metadata;
 	sbuf_putc(sbp, '\n');
-	while (bptr[0] != MODINFO_END || bptr[0] != MODINFO_END) {
+	while (bptr[0] != MODINFO_END || bptr[1] != MODINFO_END) {
 		sbuf_printf(sbp, " %p:\n", bptr);
 		type = *bptr++;
 		len = *bptr++;