2007-04-03 05:34:36 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 2007 Kai Wang
|
|
|
|
* Copyright (c) 2007 Tim Kientzle
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer
|
|
|
|
* in this position and unchanged.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "archive_platform.h"
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
#ifdef HAVE_SYS_STAT_H
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
2007-04-03 05:34:36 +00:00
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "archive.h"
|
|
|
|
#include "archive_entry.h"
|
|
|
|
#include "archive_private.h"
|
|
|
|
#include "archive_read_private.h"
|
|
|
|
|
|
|
|
struct ar {
|
|
|
|
off_t entry_bytes_remaining;
|
|
|
|
off_t entry_offset;
|
|
|
|
off_t entry_padding;
|
|
|
|
char *strtab;
|
2007-04-14 08:30:21 +00:00
|
|
|
size_t strtab_size;
|
2007-04-03 05:34:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Define structure of the "ar" header.
|
|
|
|
*/
|
|
|
|
#define AR_name_offset 0
|
|
|
|
#define AR_name_size 16
|
|
|
|
#define AR_date_offset 16
|
|
|
|
#define AR_date_size 12
|
|
|
|
#define AR_uid_offset 28
|
|
|
|
#define AR_uid_size 6
|
|
|
|
#define AR_gid_offset 34
|
|
|
|
#define AR_gid_size 6
|
|
|
|
#define AR_mode_offset 40
|
|
|
|
#define AR_mode_size 8
|
|
|
|
#define AR_size_offset 48
|
|
|
|
#define AR_size_size 10
|
|
|
|
#define AR_fmag_offset 58
|
|
|
|
#define AR_fmag_size 2
|
|
|
|
|
|
|
|
#define isdigit(x) (x) >= '0' && (x) <= '9'
|
|
|
|
|
|
|
|
static int archive_read_format_ar_bid(struct archive_read *a);
|
|
|
|
static int archive_read_format_ar_cleanup(struct archive_read *a);
|
|
|
|
static int archive_read_format_ar_read_data(struct archive_read *a,
|
|
|
|
const void **buff, size_t *size, off_t *offset);
|
|
|
|
static int archive_read_format_ar_skip(struct archive_read *a);
|
|
|
|
static int archive_read_format_ar_read_header(struct archive_read *a,
|
|
|
|
struct archive_entry *e);
|
2007-04-14 22:34:10 +00:00
|
|
|
static uint64_t ar_atol8(const char *p, unsigned char_cnt);
|
|
|
|
static uint64_t ar_atol10(const char *p, unsigned char_cnt);
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
static int ar_parse_gnu_filename_table(struct archive_read *a);
|
2007-04-14 22:34:10 +00:00
|
|
|
static int ar_parse_common_header(struct ar *ar, struct archive_entry *,
|
|
|
|
const char *h);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
archive_read_support_format_ar(struct archive *_a)
|
|
|
|
{
|
|
|
|
struct archive_read *a = (struct archive_read *)_a;
|
|
|
|
struct ar *ar;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
ar = (struct ar *)malloc(sizeof(*ar));
|
|
|
|
if (ar == NULL) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate ar data");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
memset(ar, 0, sizeof(*ar));
|
2007-04-14 08:30:21 +00:00
|
|
|
ar->strtab = NULL;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
r = __archive_read_register_format(a,
|
|
|
|
ar,
|
|
|
|
archive_read_format_ar_bid,
|
|
|
|
archive_read_format_ar_read_header,
|
|
|
|
archive_read_format_ar_read_data,
|
|
|
|
archive_read_format_ar_skip,
|
|
|
|
archive_read_format_ar_cleanup);
|
|
|
|
|
|
|
|
if (r != ARCHIVE_OK) {
|
|
|
|
free(ar);
|
|
|
|
return (r);
|
|
|
|
}
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_read_format_ar_cleanup(struct archive_read *a)
|
|
|
|
{
|
|
|
|
struct ar *ar;
|
|
|
|
|
2007-05-29 01:00:21 +00:00
|
|
|
ar = (struct ar *)(a->format->data);
|
|
|
|
if (ar->strtab)
|
|
|
|
free(ar->strtab);
|
2007-04-03 05:34:36 +00:00
|
|
|
free(ar);
|
2007-05-29 01:00:21 +00:00
|
|
|
(a->format->data) = NULL;
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_read_format_ar_bid(struct archive_read *a)
|
|
|
|
{
|
|
|
|
struct ar *ar;
|
|
|
|
const void *h;
|
|
|
|
|
|
|
|
if (a->archive.archive_format != 0 &&
|
|
|
|
(a->archive.archive_format & ARCHIVE_FORMAT_BASE_MASK) !=
|
|
|
|
ARCHIVE_FORMAT_AR)
|
|
|
|
return(0);
|
|
|
|
|
2007-05-29 01:00:21 +00:00
|
|
|
ar = (struct ar *)(a->format->data);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* Verify the 8-byte file signature.
|
2007-04-03 05:34:36 +00:00
|
|
|
* TODO: Do we need to check more than this?
|
|
|
|
*/
|
2008-12-06 06:45:15 +00:00
|
|
|
if ((h = __archive_read_ahead(a, 8, NULL)) == NULL)
|
2007-04-14 22:34:10 +00:00
|
|
|
return (-1);
|
|
|
|
if (strncmp((const char*)h, "!<arch>\n", 8) == 0) {
|
2007-12-30 04:58:22 +00:00
|
|
|
return (64);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_read_format_ar_read_header(struct archive_read *a,
|
|
|
|
struct archive_entry *entry)
|
|
|
|
{
|
2007-04-14 22:34:10 +00:00
|
|
|
char filename[AR_name_size + 1];
|
2007-04-03 05:34:36 +00:00
|
|
|
struct ar *ar;
|
2007-04-14 22:34:10 +00:00
|
|
|
uint64_t number; /* Used to hold parsed numbers before validation. */
|
|
|
|
ssize_t bytes_read;
|
2008-12-06 06:45:15 +00:00
|
|
|
size_t bsd_name_length, entry_size;
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
char *p, *st;
|
2007-04-03 05:34:36 +00:00
|
|
|
const void *b;
|
|
|
|
const char *h;
|
2007-04-14 22:34:10 +00:00
|
|
|
int r;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-05-29 01:00:21 +00:00
|
|
|
ar = (struct ar*)(a->format->data);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
if (a->archive.file_position == 0) {
|
|
|
|
/*
|
|
|
|
* We are now at the beginning of the archive,
|
|
|
|
* so we need first consume the ar global header.
|
|
|
|
*/
|
2008-12-06 06:45:15 +00:00
|
|
|
__archive_read_consume(a, 8);
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Set a default format code for now. */
|
|
|
|
a->archive.archive_format = ARCHIVE_FORMAT_AR;
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Read the header for the next file entry. */
|
2008-12-06 06:45:15 +00:00
|
|
|
if ((b = __archive_read_ahead(a, 60, &bytes_read)) == NULL)
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Broken header. */
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_EOF);
|
2008-12-06 06:45:15 +00:00
|
|
|
__archive_read_consume(a, 60);
|
2007-04-03 05:34:36 +00:00
|
|
|
h = (const char *)b;
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Verify the magic signature on the file header. */
|
|
|
|
if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) {
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_set_error(&a->archive, EINVAL,
|
2008-12-17 19:02:42 +00:00
|
|
|
"Incorrect file header signature");
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_WARN);
|
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Copy filename into work buffer. */
|
|
|
|
strncpy(filename, h + AR_name_offset, AR_name_size);
|
|
|
|
filename[AR_name_size] = '\0';
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/*
|
|
|
|
* Guess the format variant based on the filename.
|
|
|
|
*/
|
|
|
|
if (a->archive.archive_format == ARCHIVE_FORMAT_AR) {
|
|
|
|
/* We don't already know the variant, so let's guess. */
|
2007-04-03 05:34:36 +00:00
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* Biggest clue is presence of '/': GNU starts special
|
|
|
|
* filenames with '/', appends '/' as terminator to
|
|
|
|
* non-special names, so anything with '/' should be
|
|
|
|
* GNU except for BSD long filenames.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2007-04-14 22:34:10 +00:00
|
|
|
if (strncmp(filename, "#1/", 3) == 0)
|
|
|
|
a->archive.archive_format = ARCHIVE_FORMAT_AR_BSD;
|
|
|
|
else if (strchr(filename, '/') != NULL)
|
|
|
|
a->archive.archive_format = ARCHIVE_FORMAT_AR_GNU;
|
|
|
|
else if (strncmp(filename, "__.SYMDEF", 9) == 0)
|
|
|
|
a->archive.archive_format = ARCHIVE_FORMAT_AR_BSD;
|
|
|
|
/*
|
|
|
|
* XXX Do GNU/SVR4 'ar' programs ever omit trailing '/'
|
|
|
|
* if name exactly fills 16-byte field? If so, we
|
|
|
|
* can't assume entries without '/' are BSD. XXX
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update format name from the code. */
|
|
|
|
if (a->archive.archive_format == ARCHIVE_FORMAT_AR_GNU)
|
|
|
|
a->archive.archive_format_name = "ar (GNU/SVR4)";
|
|
|
|
else if (a->archive.archive_format == ARCHIVE_FORMAT_AR_BSD)
|
|
|
|
a->archive.archive_format_name = "ar (BSD)";
|
|
|
|
else
|
|
|
|
a->archive.archive_format_name = "ar";
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove trailing spaces from the filename. GNU and BSD
|
|
|
|
* variants both pad filename area out with spaces.
|
|
|
|
* This will only be wrong if GNU/SVR4 'ar' implementations
|
|
|
|
* omit trailing '/' for 16-char filenames and we have
|
|
|
|
* a 16-char filename that ends in ' '.
|
|
|
|
*/
|
|
|
|
p = filename + AR_name_size - 1;
|
|
|
|
while (p >= filename && *p == ' ') {
|
|
|
|
*p = '\0';
|
|
|
|
p--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove trailing slash unless first character is '/'.
|
|
|
|
* (BSD entries never end in '/', so this will only trim
|
|
|
|
* GNU-format entries. GNU special entries start with '/'
|
|
|
|
* and are not terminated in '/', so we don't trim anything
|
|
|
|
* that starts with '/'.)
|
|
|
|
*/
|
|
|
|
if (filename[0] != '/' && *p == '/')
|
|
|
|
*p = '\0';
|
|
|
|
|
|
|
|
/*
|
|
|
|
* '//' is the GNU filename table.
|
|
|
|
* Later entries can refer to names in this table.
|
|
|
|
*/
|
|
|
|
if (strcmp(filename, "//") == 0) {
|
|
|
|
/* This must come before any call to _read_ahead. */
|
|
|
|
ar_parse_common_header(ar, entry, h);
|
|
|
|
archive_entry_copy_pathname(entry, filename);
|
2008-02-19 05:54:24 +00:00
|
|
|
archive_entry_set_filetype(entry, AE_IFREG);
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Get the size of the filename table. */
|
|
|
|
number = ar_atol10(h + AR_size_offset, AR_size_size);
|
|
|
|
if (number > SIZE_MAX) {
|
2007-04-14 08:30:21 +00:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
2007-04-14 22:34:10 +00:00
|
|
|
"Filename table too large");
|
2007-04-14 08:30:21 +00:00
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
entry_size = (size_t)number;
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
if (entry_size == 0) {
|
|
|
|
archive_set_error(&a->archive, EINVAL,
|
|
|
|
"Invalid string table");
|
|
|
|
return (ARCHIVE_WARN);
|
|
|
|
}
|
|
|
|
if (ar->strtab != NULL) {
|
|
|
|
archive_set_error(&a->archive, EINVAL,
|
|
|
|
"More than one string tables exist");
|
|
|
|
return (ARCHIVE_WARN);
|
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Read the filename table into memory. */
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
st = malloc(entry_size);
|
|
|
|
if (st == NULL) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate filename table buffer");
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
ar->strtab = st;
|
|
|
|
ar->strtab_size = entry_size;
|
2008-12-06 06:45:15 +00:00
|
|
|
if ((b = __archive_read_ahead(a, entry_size, NULL)) == NULL)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
memcpy(st, b, entry_size);
|
|
|
|
__archive_read_consume(a, entry_size);
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
/* All contents are consumed. */
|
|
|
|
ar->entry_bytes_remaining = 0;
|
|
|
|
archive_entry_set_size(entry, ar->entry_bytes_remaining);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Parse the filename table. */
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
return (ar_parse_gnu_filename_table(a));
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/*
|
|
|
|
* GNU variant handles long filenames by storing /<number>
|
|
|
|
* to indicate a name stored in the filename table.
|
|
|
|
*/
|
|
|
|
if (filename[0] == '/' && isdigit(filename[1])) {
|
|
|
|
number = ar_atol10(h + AR_name_offset + 1, AR_name_size - 1);
|
2007-04-03 05:34:36 +00:00
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* If we can't look up the real name, warn and return
|
|
|
|
* the entry with the wrong name.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2007-04-14 22:34:10 +00:00
|
|
|
if (ar->strtab == NULL || number > ar->strtab_size) {
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_set_error(&a->archive, EINVAL,
|
2007-04-14 22:34:10 +00:00
|
|
|
"Can't find long filename for entry");
|
|
|
|
archive_entry_copy_pathname(entry, filename);
|
|
|
|
/* Parse the time, owner, mode, size fields. */
|
|
|
|
ar_parse_common_header(ar, entry, h);
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_WARN);
|
|
|
|
}
|
2007-04-14 08:30:21 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
archive_entry_copy_pathname(entry, &ar->strtab[(size_t)number]);
|
|
|
|
/* Parse the time, owner, mode, size fields. */
|
|
|
|
return (ar_parse_common_header(ar, entry, h));
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/*
|
|
|
|
* BSD handles long filenames by storing "#1/" followed by the
|
|
|
|
* length of filename as a decimal number, then prepends the
|
|
|
|
* the filename to the file contents.
|
|
|
|
*/
|
|
|
|
if (strncmp(filename, "#1/", 3) == 0) {
|
|
|
|
/* Parse the time, owner, mode, size fields. */
|
|
|
|
/* This must occur before _read_ahead is called again. */
|
|
|
|
ar_parse_common_header(ar, entry, h);
|
|
|
|
|
|
|
|
/* Parse the size of the name, adjust the file size. */
|
|
|
|
number = ar_atol10(h + AR_name_offset + 3, AR_name_size - 3);
|
2008-05-26 17:00:24 +00:00
|
|
|
bsd_name_length = (size_t)number;
|
|
|
|
/* Guard against the filename + trailing NUL
|
|
|
|
* overflowing a size_t and against the filename size
|
|
|
|
* being larger than the entire entry. */
|
|
|
|
if (number > (uint64_t)(bsd_name_length + 1)
|
|
|
|
|| (off_t)bsd_name_length > ar->entry_bytes_remaining) {
|
2007-04-14 08:30:21 +00:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Bad input file size");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
ar->entry_bytes_remaining -= bsd_name_length;
|
|
|
|
/* Adjust file size reported to client. */
|
|
|
|
archive_entry_set_size(entry, ar->entry_bytes_remaining);
|
|
|
|
|
|
|
|
/* Read the long name into memory. */
|
2008-12-06 06:45:15 +00:00
|
|
|
if ((b = __archive_read_ahead(a, bsd_name_length, NULL)) == NULL) {
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Truncated input file");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2008-12-06 06:45:15 +00:00
|
|
|
__archive_read_consume(a, bsd_name_length);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Store it in the entry. */
|
|
|
|
p = (char *)malloc(bsd_name_length + 1);
|
|
|
|
if (p == NULL) {
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate fname buffer");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
strncpy(p, b, bsd_name_length);
|
|
|
|
p[bsd_name_length] = '\0';
|
|
|
|
archive_entry_copy_pathname(entry, p);
|
|
|
|
free(p);
|
|
|
|
return (ARCHIVE_OK);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* "/" is the SVR4/GNU archive symbol table.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2007-04-14 22:34:10 +00:00
|
|
|
if (strcmp(filename, "/") == 0) {
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_entry_copy_pathname(entry, "/");
|
2007-04-14 22:34:10 +00:00
|
|
|
/* Parse the time, owner, mode, size fields. */
|
|
|
|
r = ar_parse_common_header(ar, entry, h);
|
|
|
|
/* Force the file type to a regular file. */
|
2008-02-19 05:54:24 +00:00
|
|
|
archive_entry_set_filetype(entry, AE_IFREG);
|
2007-04-14 22:34:10 +00:00
|
|
|
return (r);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
|
2007-04-03 05:34:36 +00:00
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* "__.SYMDEF" is a BSD archive symbol table.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2007-04-14 22:34:10 +00:00
|
|
|
if (strcmp(filename, "__.SYMDEF") == 0) {
|
|
|
|
archive_entry_copy_pathname(entry, filename);
|
|
|
|
/* Parse the time, owner, mode, size fields. */
|
|
|
|
return (ar_parse_common_header(ar, entry, h));
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-04-14 22:34:10 +00:00
|
|
|
* Otherwise, this is a standard entry. The filename
|
|
|
|
* has already been trimmed as much as possible, based
|
|
|
|
* on our current knowledge of the format.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2007-04-14 22:34:10 +00:00
|
|
|
archive_entry_copy_pathname(entry, filename);
|
|
|
|
return (ar_parse_common_header(ar, entry, h));
|
|
|
|
}
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
static int
|
|
|
|
ar_parse_common_header(struct ar *ar, struct archive_entry *entry,
|
|
|
|
const char *h)
|
|
|
|
{
|
|
|
|
uint64_t n;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
/* Copy remaining header */
|
|
|
|
archive_entry_set_mtime(entry,
|
2007-04-14 08:30:21 +00:00
|
|
|
(time_t)ar_atol10(h + AR_date_offset, AR_date_size), 0L);
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_entry_set_uid(entry,
|
2007-04-14 08:30:21 +00:00
|
|
|
(uid_t)ar_atol10(h + AR_uid_offset, AR_uid_size));
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_entry_set_gid(entry,
|
2007-04-14 08:30:21 +00:00
|
|
|
(gid_t)ar_atol10(h + AR_gid_offset, AR_gid_size));
|
2007-04-03 05:34:36 +00:00
|
|
|
archive_entry_set_mode(entry,
|
2007-04-14 08:30:21 +00:00
|
|
|
(mode_t)ar_atol8(h + AR_mode_offset, AR_mode_size));
|
2007-04-14 22:34:10 +00:00
|
|
|
n = ar_atol10(h + AR_size_offset, AR_size_size);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
ar->entry_offset = 0;
|
2007-04-14 22:34:10 +00:00
|
|
|
ar->entry_padding = n % 2;
|
|
|
|
archive_entry_set_size(entry, n);
|
|
|
|
ar->entry_bytes_remaining = n;
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_read_format_ar_read_data(struct archive_read *a,
|
|
|
|
const void **buff, size_t *size, off_t *offset)
|
|
|
|
{
|
|
|
|
ssize_t bytes_read;
|
|
|
|
struct ar *ar;
|
|
|
|
|
2007-05-29 01:00:21 +00:00
|
|
|
ar = (struct ar *)(a->format->data);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
if (ar->entry_bytes_remaining > 0) {
|
2008-12-06 06:45:15 +00:00
|
|
|
*buff = __archive_read_ahead(a, 1, &bytes_read);
|
2007-04-03 05:34:36 +00:00
|
|
|
if (bytes_read == 0) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Truncated ar archive");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
if (bytes_read < 0)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
if (bytes_read > ar->entry_bytes_remaining)
|
2007-04-14 08:30:21 +00:00
|
|
|
bytes_read = (ssize_t)ar->entry_bytes_remaining;
|
2007-04-03 05:34:36 +00:00
|
|
|
*size = bytes_read;
|
|
|
|
*offset = ar->entry_offset;
|
|
|
|
ar->entry_offset += bytes_read;
|
|
|
|
ar->entry_bytes_remaining -= bytes_read;
|
2008-12-06 06:45:15 +00:00
|
|
|
__archive_read_consume(a, (size_t)bytes_read);
|
2007-04-03 05:34:36 +00:00
|
|
|
return (ARCHIVE_OK);
|
|
|
|
} else {
|
|
|
|
while (ar->entry_padding > 0) {
|
2008-12-06 06:45:15 +00:00
|
|
|
*buff = __archive_read_ahead(a, 1, &bytes_read);
|
2007-04-03 05:34:36 +00:00
|
|
|
if (bytes_read <= 0)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
if (bytes_read > ar->entry_padding)
|
2007-04-14 08:30:21 +00:00
|
|
|
bytes_read = (ssize_t)ar->entry_padding;
|
2008-12-06 06:45:15 +00:00
|
|
|
__archive_read_consume(a, (size_t)bytes_read);
|
2007-04-03 05:34:36 +00:00
|
|
|
ar->entry_padding -= bytes_read;
|
|
|
|
}
|
|
|
|
*buff = NULL;
|
|
|
|
*size = 0;
|
|
|
|
*offset = ar->entry_offset;
|
|
|
|
return (ARCHIVE_EOF);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_read_format_ar_skip(struct archive_read *a)
|
|
|
|
{
|
|
|
|
off_t bytes_skipped;
|
|
|
|
struct ar* ar;
|
|
|
|
|
2007-05-29 01:00:21 +00:00
|
|
|
ar = (struct ar *)(a->format->data);
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2008-12-06 06:45:15 +00:00
|
|
|
bytes_skipped = __archive_read_skip(a,
|
|
|
|
ar->entry_bytes_remaining + ar->entry_padding);
|
2007-04-03 05:34:36 +00:00
|
|
|
if (bytes_skipped < 0)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
|
|
|
|
ar->entry_bytes_remaining = 0;
|
|
|
|
ar->entry_padding = 0;
|
|
|
|
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
ar_parse_gnu_filename_table(struct archive_read *a)
|
2007-04-03 05:34:36 +00:00
|
|
|
{
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
struct ar *ar;
|
2007-04-03 05:34:36 +00:00
|
|
|
char *p;
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
size_t size;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
Current 'ar' read support in libarchive can only handle a GNU/SVR4
filename table whose size is less than 65536 bytes.
The original intention was to not consume the filename table, so the
client will have a chance to look at it. To achieve that, the library
call decompressor->read_ahead to read(look ahead) but do not call
decompressor->consume to consume the data, thus a limit was raised
since read_ahead call can only look ahead at most BUFFER_SIZE(65536)
bytes at the moment, and you can not "look any further" before you
consume what you already "saw".
This commit will turn GNU/SVR4 filename table into "archive format
data", i.e., filename table will be consumed by libarchive, so the
65536-bytes limit will be gone, but client can no longer have access
to the content of filename table.
'ar' support test suite is changed accordingly. BSD ar(1) is not
affected by this change since it doesn't look at the filename table.
Reported by: erwin
Discussed with: jkoshy, kientzle
Reviewed by: jkoshy, kientzle
Approved by: jkoshy(mentor), kientzle
2008-03-12 21:10:26 +00:00
|
|
|
ar = (struct ar*)(a->format->data);
|
|
|
|
size = ar->strtab_size;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 08:30:21 +00:00
|
|
|
for (p = ar->strtab; p < ar->strtab + size - 1; ++p) {
|
2007-04-03 05:34:36 +00:00
|
|
|
if (*p == '/') {
|
|
|
|
*p++ = '\0';
|
2007-04-14 08:30:21 +00:00
|
|
|
if (*p != '\n')
|
|
|
|
goto bad_string_table;
|
|
|
|
*p = '\0';
|
|
|
|
}
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
/*
|
2009-02-01 02:33:02 +00:00
|
|
|
* GNU ar always pads the table to an even size.
|
|
|
|
* The pad character is either '\n' or '`'.
|
2007-04-03 05:34:36 +00:00
|
|
|
*/
|
2009-02-01 02:33:02 +00:00
|
|
|
if (p != ar->strtab + size && *p != '\n' && *p != '`')
|
2007-04-14 08:30:21 +00:00
|
|
|
goto bad_string_table;
|
|
|
|
|
|
|
|
/* Enforce zero termination. */
|
|
|
|
ar->strtab[size - 1] = '\0';
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
return (ARCHIVE_OK);
|
2007-04-14 08:30:21 +00:00
|
|
|
|
|
|
|
bad_string_table:
|
|
|
|
archive_set_error(&a->archive, EINVAL,
|
|
|
|
"Invalid string table");
|
|
|
|
free(ar->strtab);
|
|
|
|
ar->strtab = NULL;
|
|
|
|
return (ARCHIVE_WARN);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
static uint64_t
|
2007-04-03 05:34:36 +00:00
|
|
|
ar_atol8(const char *p, unsigned char_cnt)
|
|
|
|
{
|
2007-04-14 22:34:10 +00:00
|
|
|
uint64_t l, limit, last_digit_limit;
|
|
|
|
unsigned int digit, base;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
base = 8;
|
2007-04-15 00:53:38 +00:00
|
|
|
limit = UINT64_MAX / base;
|
|
|
|
last_digit_limit = UINT64_MAX % base;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
while ((*p == ' ' || *p == '\t') && char_cnt-- > 0)
|
2007-04-03 05:34:36 +00:00
|
|
|
p++;
|
|
|
|
|
|
|
|
l = 0;
|
|
|
|
digit = *p - '0';
|
2007-04-14 22:34:10 +00:00
|
|
|
while (*p >= '0' && digit < base && char_cnt-- > 0) {
|
2007-04-03 05:34:36 +00:00
|
|
|
if (l>limit || (l == limit && digit > last_digit_limit)) {
|
2007-04-15 00:53:38 +00:00
|
|
|
l = UINT64_MAX; /* Truncate on overflow. */
|
2007-04-03 05:34:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
l = (l * base) + digit;
|
|
|
|
digit = *++p - '0';
|
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
return (l);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
static uint64_t
|
2007-04-03 05:34:36 +00:00
|
|
|
ar_atol10(const char *p, unsigned char_cnt)
|
|
|
|
{
|
2007-04-14 22:34:10 +00:00
|
|
|
uint64_t l, limit, last_digit_limit;
|
|
|
|
unsigned int base, digit;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
|
|
|
base = 10;
|
2007-04-15 00:53:38 +00:00
|
|
|
limit = UINT64_MAX / base;
|
|
|
|
last_digit_limit = UINT64_MAX % base;
|
2007-04-03 05:34:36 +00:00
|
|
|
|
2007-04-14 22:34:10 +00:00
|
|
|
while ((*p == ' ' || *p == '\t') && char_cnt-- > 0)
|
2007-04-03 05:34:36 +00:00
|
|
|
p++;
|
|
|
|
l = 0;
|
|
|
|
digit = *p - '0';
|
2007-04-14 22:34:10 +00:00
|
|
|
while (*p >= '0' && digit < base && char_cnt-- > 0) {
|
2007-04-03 05:34:36 +00:00
|
|
|
if (l > limit || (l == limit && digit > last_digit_limit)) {
|
2007-04-15 00:53:38 +00:00
|
|
|
l = UINT64_MAX; /* Truncate on overflow. */
|
2007-04-03 05:34:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
l = (l * base) + digit;
|
|
|
|
digit = *++p - '0';
|
|
|
|
}
|
2007-04-14 22:34:10 +00:00
|
|
|
return (l);
|
2007-04-03 05:34:36 +00:00
|
|
|
}
|