Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix qasan type confusion #2899

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Fix qasan type confusion #2899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions libafl_qemu/libqasan/malloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,6 @@ struct chunk_begin {

} __attribute__((packed));

struct chunk_struct {
struct chunk_begin begin;
char redzone[REDZONE_SIZE];
size_t prev_size_padding;

} __attribute__((packed));

#ifdef USE_LIBC_ALLOC

void *(*__lq_libc_memalign)(size_t, size_t);
Expand Down Expand Up @@ -177,14 +170,14 @@ void *__libqasan_malloc(size_t size) {

struct chunk_begin *p = backend_memalign(
ALLOC_ALIGN_SIZE,
sizeof(struct chunk_struct) + qasan_align_up(size, ALLOC_ALIGN_SIZE));
sizeof(struct chunk_begin) + qasan_align_up(size, ALLOC_ALIGN_SIZE));

QASAN_SWAP(state);

if (!p) return NULL;

QASAN_UNPOISON(
p, sizeof(struct chunk_struct) + qasan_align_up(size, ALLOC_ALIGN_SIZE));
p, sizeof(struct chunk_begin) + qasan_align_up(size, ALLOC_ALIGN_SIZE));

p->requested_size = size;
p->aligned_orig = NULL;
Expand Down Expand Up @@ -281,13 +274,13 @@ int __libqasan_posix_memalign(void **ptr, size_t align, size_t len) {

char *orig = backend_memalign(
ALLOC_ALIGN_SIZE,
sizeof(struct chunk_struct) + qasan_align_up(size, ALLOC_ALIGN_SIZE));
sizeof(struct chunk_begin) + qasan_align_up(size, ALLOC_ALIGN_SIZE));

QASAN_SWAP(state);

if (!orig) return ENOMEM;

QASAN_UNPOISON(orig, sizeof(struct chunk_struct) +
QASAN_UNPOISON(orig, sizeof(struct chunk_begin) +
qasan_align_up(size, ALLOC_ALIGN_SIZE));

char *data = orig + sizeof(struct chunk_begin);
Expand Down
Loading