diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2021-12-05 11:51:17 +0100 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2021-12-07 23:32:53 +0100 |
commit | cbab7f726877badc5059316e7248be7c3bff9d96 (patch) | |
tree | 4b02fa3bf598e493ec0a0a6b0f08f8c16bab2fc7 /locale/programs/locarchive.c | |
parent | ceeffe968c01b1202e482f4855cb6baf5c6cb713 (diff) | |
download | glibc-cbab7f726877badc5059316e7248be7c3bff9d96.tar.gz glibc-cbab7f726877badc5059316e7248be7c3bff9d96.tar.xz glibc-cbab7f726877badc5059316e7248be7c3bff9d96.zip |
localedef: check magic value on archive load [BZ #28650]
localedef currently blindly trust the archive header. When passed an archive file with the wrong endianess, this leads to a segmentation fault: $ localedef --big-endian --list-archive /usr/lib/locale/locale-archive Segmentation fault (core dumped) When passed non-archive files, asserts are reported on the best case, but sometimes it can lead to a segmentation fault: $ localedef --list-archive /bin/true localedef: programs/locarchive.c:1643: show_archive_content: Assertion `used < GET (head->namehash_used)' failed. Aborted (core dumped) $ localedef --list-archive /usr/lib/locale/C.utf8/LC_COLLATE Segmentation fault (core dumped) This patch improves the user experience by looking at the magic value, which is always written, but never checked. It should still be possible to trigger a segmentation fault with crafted files, but this already catch many cases.
Diffstat (limited to 'locale/programs/locarchive.c')
-rw-r--r-- | locale/programs/locarchive.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index eeec3ab648..477499bd40 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -654,6 +654,13 @@ open_archive (struct locarhandle *ah, bool readonly) error (EXIT_FAILURE, errno, _("cannot read archive header")); } + /* Check the magic value */ + if (GET (head.magic) != AR_MAGIC) + { + (void) lockf64 (fd, F_ULOCK, sizeof (struct locarhead)); + error (EXIT_FAILURE, 0, _("bad magic value in archive header")); + } + ah->fd = fd; ah->mmaped = st.st_size; |