git: efe145a7453e - main - Correct assert added to dump program.

[Kirk McKusick]

The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=efe145a7453e4208f032816ce3f80e9fb6b0e4ee

commit efe145a7453e4208f032816ce3f80e9fb6b0e4ee
Author:     Kirk McKusick <mckusick at FreeBSD.org>
AuthorDate: 2021-05-17 23:33:59 +0000
Commit:     Kirk McKusick <mckusick at FreeBSD.org>
CommitDate: 2021-05-17 23:34:53 +0000

    Correct assert added to dump program.
    
    The dump program was exiting with the message:
    
    Assertion failed: (spcl.c_count + blks < TP_NINDIR), function appendextdata, file /usr/src/sbin/dump/traverse.c, line 759.
    
    The problem arose when dumping external attributes.
    
    This assertion was added in this commit with no review by someone
    with expertise in the dump program:
    
        commit 2d518c6518cdb256ff6f2c463e6b115d89c104c3
        Author:     Warner Losh <imp at FreeBSD.org>
        AuthorDate: Mon Jun 11 19:32:36 2018 +0000
        Commit:     Warner Losh <imp at FreeBSD.org>
        CommitDate: Mon Jun 11 19:32:36 2018 +0000
    
            Add asserts to prevent overflows of c_addr.
    
    It is clearly wrong as the statement immediately above it in the
    code which is deciding if the data will fit is:
    
            if (spcl.c_count + blks > TP_NINDIR)
                    return (0);
    
    As is pointed out in the bug report, the assert should be:
    
            (spcl.c_count + blks <= TP_NINDIR)
    
    This commit corrects the assert. I am sorry that it took so long to
    be brought to my attention and get fixed.
    
    Reported by:  Hampton Finger
    PR:           244470
    MFC after:    3 days
    Sponsored by: Netflix
---
 sbin/dump/traverse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index d094a08a7eb0..3630d2240f58 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -756,7 +756,7 @@ appendextdata(union dinode *dp)
 	 * data by the writeextdata() routine.
 	 */
 	tbperdb = sblock->fs_bsize >> tp_bshift;
-	assert(spcl.c_count + blks < TP_NINDIR);
+	assert(spcl.c_count + blks <= TP_NINDIR);
 	for (i = 0; i < blks; i++)
 		if (&dp->dp2.di_extb[i / tbperdb] != 0)
 				spcl.c_addr[spcl.c_count + i] = 1;