|
| 1 | +From 8a0cc2ca12fc939ac7390776ae12de627372650d Mon Sep 17 00:00:00 2001 |
| 2 | +From: Durga Jagadeesh Palli <v-dpalli@microsoft.com> |
| 3 | +Date: Tue, 9 Sep 2025 00:32:16 +0000 |
| 4 | +Subject: [PATCH] Address CVE-2025-5918 and fix the FILE skip regression. |
| 5 | + |
| 6 | +Upstream Patch Reference: https://github.com/libarchive/libarchive/pull/2584 |
| 7 | +Upstream Patch Reference for fix FILE_skip regression: https://github.com/libarchive/libarchive/pull/2642 |
| 8 | + |
| 9 | +--- |
| 10 | + Utilities/cmlibarchive/libarchive/archive_read_open_fd.c | 13 +++++-- |
| 11 | + Utilities/cmlibarchive/libarchive/archive_read_open_file.c | 36 ++++++++++++++----- |
| 12 | + Utilities/cmlibarchive/libarchive/archive_read_open_filename.c | 30 ++++++++++++---- |
| 13 | + 3 files changed, 62 insertions(+), 17 deletions(-) |
| 14 | + |
| 15 | +diff --git a/Utilities/cmlibarchive/libarchive/archive_read_open_fd.c b/Utilities/cmlibarchive/libarchive/archive_read_open_fd.c |
| 16 | +index f59cd07f..f8c5d0a1 100644 |
| 17 | +--- a/Utilities/cmlibarchive/libarchive/archive_read_open_fd.c |
| 18 | ++++ b/Utilities/cmlibarchive/libarchive/archive_read_open_fd.c |
| 19 | +@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_fd.c 201103 2009-12-28 |
| 20 | + struct read_fd_data { |
| 21 | + int fd; |
| 22 | + size_t block_size; |
| 23 | ++ int64_t size; |
| 24 | + char use_lseek; |
| 25 | + void *buffer; |
| 26 | + }; |
| 27 | +@@ -96,6 +97,7 @@ archive_read_open_fd(struct archive *a, int fd, size_t block_size) |
| 28 | + if (S_ISREG(st.st_mode)) { |
| 29 | + archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); |
| 30 | + mine->use_lseek = 1; |
| 31 | ++ mine->size = st.st_size; |
| 32 | + } |
| 33 | + #if defined(__CYGWIN__) || defined(_WIN32) |
| 34 | + setmode(mine->fd, O_BINARY); |
| 35 | +@@ -152,9 +154,14 @@ file_skip(struct archive *a, void *client_data, int64_t request) |
| 36 | + if (request == 0) |
| 37 | + return (0); |
| 38 | + |
| 39 | +- if (((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) && |
| 40 | +- ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0)) |
| 41 | +- return (new_offset - old_offset); |
| 42 | ++ if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) { |
| 43 | ++ if (old_offset >= mine->size || |
| 44 | ++ skip > mine->size - old_offset) { |
| 45 | ++ /* Do not seek past end of file. */ |
| 46 | ++ errno = ESPIPE; |
| 47 | ++ } else if ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0) |
| 48 | ++ return (new_offset - old_offset); |
| 49 | ++ } |
| 50 | + |
| 51 | + /* If seek failed once, it will probably fail again. */ |
| 52 | + mine->use_lseek = 0; |
| 53 | +diff --git a/Utilities/cmlibarchive/libarchive/archive_read_open_file.c b/Utilities/cmlibarchive/libarchive/archive_read_open_file.c |
| 54 | +index 101dae6c..de77e74f 100644 |
| 55 | +--- a/Utilities/cmlibarchive/libarchive/archive_read_open_file.c |
| 56 | ++++ b/Utilities/cmlibarchive/libarchive/archive_read_open_file.c |
| 57 | +@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_file.c 201093 2009-12- |
| 58 | + struct read_FILE_data { |
| 59 | + FILE *f; |
| 60 | + size_t block_size; |
| 61 | ++ int64_t size; |
| 62 | + void *buffer; |
| 63 | + char can_skip; |
| 64 | + }; |
| 65 | +@@ -91,6 +92,7 @@ archive_read_open_FILE(struct archive *a, FILE *f) |
| 66 | + archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); |
| 67 | + /* Enable the seek optimization only for regular files. */ |
| 68 | + mine->can_skip = 1; |
| 69 | ++ mine->size = st.st_size; |
| 70 | + } else |
| 71 | + mine->can_skip = 0; |
| 72 | + |
| 73 | +@@ -130,6 +132,7 @@ file_skip(struct archive *a, void *client_data, int64_t request) |
| 74 | + #else |
| 75 | + long skip = (long)request; |
| 76 | + #endif |
| 77 | ++ int64_t old_offset, new_offset = -1; |
| 78 | + int skip_bits = sizeof(skip) * 8 - 1; |
| 79 | + |
| 80 | + (void)a; /* UNUSED */ |
| 81 | +@@ -153,19 +156,36 @@ file_skip(struct archive *a, void *client_data, int64_t request) |
| 82 | + |
| 83 | + #ifdef __ANDROID__ |
| 84 | + /* fileno() isn't safe on all platforms ... see above. */ |
| 85 | +- if (lseek(fileno(mine->f), skip, SEEK_CUR) < 0) |
| 86 | ++ old_offset = lseek(fileno(mine->f), 0, SEEK_CUR); |
| 87 | + #elif HAVE_FSEEKO |
| 88 | +- if (fseeko(mine->f, skip, SEEK_CUR) != 0) |
| 89 | ++ old_offset = ftello(mine->f); |
| 90 | + #elif HAVE__FSEEKI64 |
| 91 | +- if (_fseeki64(mine->f, skip, SEEK_CUR) != 0) |
| 92 | ++ old_offset = _ftelli64(mine->f); |
| 93 | + #else |
| 94 | +- if (fseek(mine->f, skip, SEEK_CUR) != 0) |
| 95 | ++ old_offset = ftell(mine->f); |
| 96 | + #endif |
| 97 | +- { |
| 98 | +- mine->can_skip = 0; |
| 99 | +- return (0); |
| 100 | ++ if (old_offset >= 0) { |
| 101 | ++ if (old_offset < mine->size && |
| 102 | ++ skip <= mine->size - old_offset) { |
| 103 | ++#ifdef __ANDROID__ |
| 104 | ++ new_offset = lseek(fileno(mine->f), skip, SEEK_CUR); |
| 105 | ++#elif HAVE__FSEEKI64 |
| 106 | ++ if (_fseeki64(mine->f, skip, SEEK_CUR) == 0) |
| 107 | ++ new_offset = _ftelli64(mine->f); |
| 108 | ++#elif HAVE_FSEEKO |
| 109 | ++ if (fseeko(mine->f, skip, SEEK_CUR) == 0) |
| 110 | ++ new_offset = ftello(mine->f); |
| 111 | ++#else |
| 112 | ++ if (fseek(mine->f, skip, SEEK_CUR) == 0) |
| 113 | ++ new_offset = ftell(mine->f); |
| 114 | ++#endif |
| 115 | ++ if (new_offset >= 0) |
| 116 | ++ return (new_offset - old_offset); |
| 117 | ++ } |
| 118 | + } |
| 119 | +- return (request); |
| 120 | ++ |
| 121 | ++ mine->can_skip = 0; |
| 122 | ++ return (0); |
| 123 | + } |
| 124 | + |
| 125 | + static int |
| 126 | +diff --git a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c |
| 127 | +index 86635e21..84556a15 100644 |
| 128 | +--- a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c |
| 129 | ++++ b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c |
| 130 | +@@ -75,6 +75,7 @@ struct read_file_data { |
| 131 | + size_t block_size; |
| 132 | + void *buffer; |
| 133 | + mode_t st_mode; /* Mode bits for opened file. */ |
| 134 | ++ int64_t size; |
| 135 | + char use_lseek; |
| 136 | + enum fnt_e { FNT_STDIN, FNT_MBS, FNT_WCS } filename_type; |
| 137 | + union { |
| 138 | +@@ -366,8 +367,10 @@ file_open(struct archive *a, void *client_data) |
| 139 | + mine->st_mode = st.st_mode; |
| 140 | + |
| 141 | + /* Disk-like inputs can use lseek(). */ |
| 142 | +- if (is_disk_like) |
| 143 | ++ if (is_disk_like) { |
| 144 | + mine->use_lseek = 1; |
| 145 | ++ mine->size = st.st_size; |
| 146 | ++ } |
| 147 | + |
| 148 | + return (ARCHIVE_OK); |
| 149 | + fail: |
| 150 | +@@ -445,21 +448,36 @@ file_skip_lseek(struct archive *a, void *client_data, int64_t request) |
| 151 | + struct read_file_data *mine = (struct read_file_data *)client_data; |
| 152 | + #if defined(_WIN32) && !defined(__CYGWIN__) |
| 153 | + /* We use _lseeki64() on Windows. */ |
| 154 | +- int64_t old_offset, new_offset; |
| 155 | ++ int64_t old_offset, new_offset, skip = request;; |
| 156 | + #else |
| 157 | +- off_t old_offset, new_offset; |
| 158 | ++ off_t old_offset, new_offset, skip = (off_t)request; |
| 159 | + #endif |
| 160 | ++ int skip_bits = sizeof(skip) * 8 - 1; |
| 161 | + |
| 162 | + /* We use off_t here because lseek() is declared that way. */ |
| 163 | + |
| 164 | ++ /* Reduce a request that would overflow the 'skip' variable. */ |
| 165 | ++ if (sizeof(request) > sizeof(skip)) { |
| 166 | ++ const int64_t max_skip = |
| 167 | ++ (((int64_t)1 << (skip_bits - 1)) - 1) * 2 + 1; |
| 168 | ++ if (request > max_skip) |
| 169 | ++ skip = max_skip; |
| 170 | ++ } |
| 171 | ++ |
| 172 | + /* TODO: Deal with case where off_t isn't 64 bits. |
| 173 | + * This shouldn't be a problem on Linux or other POSIX |
| 174 | + * systems, since the configuration logic for libarchive |
| 175 | + * tries to obtain a 64-bit off_t. |
| 176 | + */ |
| 177 | +- if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0 && |
| 178 | +- (new_offset = lseek(mine->fd, request, SEEK_CUR)) >= 0) |
| 179 | +- return (new_offset - old_offset); |
| 180 | ++ |
| 181 | ++ if ((old_offset = lseek(mine->fd, 0, SEEK_CUR)) >= 0) { |
| 182 | ++ if (old_offset >= mine->size || |
| 183 | ++ skip > mine->size - old_offset) { |
| 184 | ++ /* Do not seek past end of file. */ |
| 185 | ++ errno = ESPIPE; |
| 186 | ++ } else if ((new_offset = lseek(mine->fd, skip, SEEK_CUR)) >= 0) |
| 187 | ++ return (new_offset - old_offset); |
| 188 | ++ } |
| 189 | + |
| 190 | + /* If lseek() fails, don't bother trying again. */ |
| 191 | + mine->use_lseek = 0; |
| 192 | +-- |
| 193 | +2.45.4 |
| 194 | + |
0 commit comments