SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catalog: _cleanup_close_ is your friend

Browse Source
This commit is contained in:
Lennart Poettering
2019-03-07 15:10:06 +01:00
parent 3d477d6101
commit 0c0e87fcd5
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/catalog.c
+6 -13
View File
@@ -508,10 +508,10 @@ int catalog_update(const char* database, const char* root, const char* const* di
}
static int open_mmap(const char *database, int *_fd, struct stat *_st, void **_p) {
_cleanup_close_ int fd = -1;
const CatalogHeader *h;
int fd;
void *p;
struct stat st;
void *p;
assert(_fd);
assert(_st);
@@ -521,21 +521,15 @@ static int open_mmap(const char *database, int *_fd, struct stat *_st, void **_p
if (fd < 0)
return -errno;
if (fstat(fd, &st) < 0) {
safe_close(fd);
if (fstat(fd, &st) < 0)
return -errno;
}
if (st.st_size < (off_t) sizeof(CatalogHeader)) {
safe_close(fd);
if (st.st_size < (off_t) sizeof(CatalogHeader))
return -EINVAL;
}
p = mmap(NULL, PAGE_ALIGN(st.st_size), PROT_READ, MAP_SHARED, fd, 0);
if (p == MAP_FAILED) {
safe_close(fd);
if (p == MAP_FAILED)
return -errno;
}
h = p;
if (memcmp(h->signature, (const uint8_t[]) CATALOG_SIGNATURE, sizeof(h->signature)) != 0 ||
@@ -544,12 +538,11 @@ static int open_mmap(const char *database, int *_fd, struct stat *_st, void **_p
h->incompatible_flags != 0 ||
le64toh(h->n_items) <= 0 ||
st.st_size < (off_t) (le64toh(h->header_size) + le64toh(h->catalog_item_size) * le64toh(h->n_items))) {
safe_close(fd);
munmap(p, st.st_size);
return -EBADMSG;
}
*_fd = fd;
*_fd = TAKE_FD(fd);
*_st = st;
*_p = p;