[src/trunk]: src/external/bsd/libarchive/dist/libarchive libarchive: fail if ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7606aa2a93c6
branches:  trunk
changeset: 376318:7606aa2a93c6
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Jun 10 12:46:32 2023 +0000

description:
libarchive: fail if name_max is 0

Add error handling to the USE_READDIR_R code paths that set name_max
from struct statfs or statvfs; if the determined name_max == 0
then return an error.

Avoids a crash in tree_dir_next_posix() when the calculation of
dirent_size from name_max is too small for the memory allocated
for struct dirent.

Submitted to upstream in pull request
        https://github.com/libarchive/libarchive/pull/1903

Should fix PR bin/56080

diffstat:

 external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c |  25 ++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diffs (63 lines):

diff -r a78db9fb0d10 -r 7606aa2a93c6 external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c
--- a/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c Sat Jun 10 11:01:58 2023 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c Sat Jun 10 12:46:32 2023 +0000
@@ -1653,6 +1653,11 @@ setup_current_filesystem(struct archive_
        else
                t->current_filesystem->name_max = nm;
 #endif
+       if (t->current_filesystem->name_max == 0) {
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                   "Cannot determine name_max");
+               return (ARCHIVE_FAILED);
+       }
 #endif /* USE_READDIR_R */
        return (ARCHIVE_OK);
 }
@@ -1726,6 +1731,11 @@ setup_current_filesystem(struct archive_
 
        /* Set maximum filename length. */
        t->current_filesystem->name_max = sfs.f_namemax;
+       if (t->current_filesystem->name_max == 0) {
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                   "Cannot determine name_max");
+               return (ARCHIVE_FAILED);
+       }
        return (ARCHIVE_OK);
 }
 
@@ -1858,6 +1868,11 @@ setup_current_filesystem(struct archive_
 #if defined(USE_READDIR_R)
        /* Set maximum filename length. */
        t->current_filesystem->name_max = sfs.f_namelen;
+       if (t->current_filesystem->name_max == 0) {
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                   "Cannot determine name_max");
+               return (ARCHIVE_FAILED);
+       }
 #endif
        return (ARCHIVE_OK);
 }
@@ -1939,6 +1954,11 @@ setup_current_filesystem(struct archive_
 #if defined(USE_READDIR_R)
        /* Set maximum filename length. */
        t->current_filesystem->name_max = sfs.f_namemax;
+       if (t->current_filesystem->name_max == 0) {
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                   "Cannot determine name_max");
+               return (ARCHIVE_FAILED);
+       }
 #endif
        return (ARCHIVE_OK);
 }
@@ -1993,6 +2013,11 @@ setup_current_filesystem(struct archive_
        else
                t->current_filesystem->name_max = nm;
 #  endif /* _PC_NAME_MAX */
+       if (t->current_filesystem->name_max == 0) {
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                   "Cannot determine name_max");
+               return (ARCHIVE_FAILED);
+       }
 #endif /* USE_READDIR_R */
        return (ARCHIVE_OK);
 }