[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
// RUN: %clang_scudo %s -o %t
|
2018-02-27 01:14:44 +08:00
|
|
|
// RUN: %run %t valid 2>&1
|
2018-06-16 00:45:19 +08:00
|
|
|
// RUN: not %run %t invalid 2>&1 | FileCheck --check-prefix=CHECK-align %s
|
2018-02-27 01:14:44 +08:00
|
|
|
// RUN: %env_scudo_opts=allocator_may_return_null=1 %run %t invalid 2>&1
|
|
|
|
// RUN: not %run %t double-free 2>&1 | FileCheck --check-prefix=CHECK-double-free %s
|
|
|
|
// RUN: %env_scudo_opts=DeallocationTypeMismatch=1 not %run %t realloc 2>&1 | FileCheck --check-prefix=CHECK-realloc %s
|
|
|
|
// RUN: %env_scudo_opts=DeallocationTypeMismatch=0 %run %t realloc 2>&1
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
|
|
|
|
// Tests that the various aligned allocation functions work as intended. Also
|
|
|
|
// tests for the condition where the alignment is not a power of 2.
|
|
|
|
|
|
|
|
#include <assert.h>
|
2017-06-30 00:45:20 +08:00
|
|
|
#include <errno.h>
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
#include <malloc.h>
|
2017-07-26 05:18:02 +08:00
|
|
|
#include <stdint.h>
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2017-07-26 05:18:02 +08:00
|
|
|
#include <unistd.h>
|
2016-12-15 00:38:11 +08:00
|
|
|
|
2016-06-08 04:09:49 +08:00
|
|
|
// Sometimes the headers may not have this...
|
[scudo] Implement stricter separation of C vs C++
Summary:
Initially, Scudo had a monolithic design where both C and C++ functions were
living in the same library. This was not necessarily ideal, and with the work
on -fsanitize=scudo, it became more apparent that this needed to change.
We are splitting the new/delete interceptor in their own C++ library. This
allows more flexibility, notably with regard to std::bad_alloc when the work is
done. This also allows us to not link new & delete when using pure C.
Additionally, we add the UBSan runtimes with Scudo, in order to be able to have
a -fsanitize=scudo,undefined in Clang (see work in D39334).
The changes in this patch:
- split the cxx specific code in the scudo cmake file into a new library;
(remove the spurious foreach loop, that was not necessary)
- add the UBSan runtimes (both C and C++);
- change the test cmake file to allow for specific C & C++ tests;
- make C tests pure C, rename their extension accordingly.
Reviewers: alekseyshl
Reviewed By: alekseyshl
Subscribers: srhines, mgorny, llvm-commits
Differential Revision: https://reviews.llvm.org/D39461
llvm-svn: 317097
2017-11-01 23:28:20 +08:00
|
|
|
void *aligned_alloc(size_t alignment, size_t size);
|
2016-06-08 04:09:49 +08:00
|
|
|
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
[scudo] Implement stricter separation of C vs C++
Summary:
Initially, Scudo had a monolithic design where both C and C++ functions were
living in the same library. This was not necessarily ideal, and with the work
on -fsanitize=scudo, it became more apparent that this needed to change.
We are splitting the new/delete interceptor in their own C++ library. This
allows more flexibility, notably with regard to std::bad_alloc when the work is
done. This also allows us to not link new & delete when using pure C.
Additionally, we add the UBSan runtimes with Scudo, in order to be able to have
a -fsanitize=scudo,undefined in Clang (see work in D39334).
The changes in this patch:
- split the cxx specific code in the scudo cmake file into a new library;
(remove the spurious foreach loop, that was not necessary)
- add the UBSan runtimes (both C and C++);
- change the test cmake file to allow for specific C & C++ tests;
- make C tests pure C, rename their extension accordingly.
Reviewers: alekseyshl
Reviewed By: alekseyshl
Subscribers: srhines, mgorny, llvm-commits
Differential Revision: https://reviews.llvm.org/D39461
llvm-svn: 317097
2017-11-01 23:28:20 +08:00
|
|
|
void *p = NULL;
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
size_t alignment = 1U << 12;
|
2016-10-01 03:57:21 +08:00
|
|
|
size_t size = 1U << 12;
|
2017-06-30 00:45:20 +08:00
|
|
|
int err;
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
|
|
|
|
assert(argc == 2);
|
2016-10-01 03:57:21 +08:00
|
|
|
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
if (!strcmp(argv[1], "valid")) {
|
|
|
|
posix_memalign(&p, alignment, size);
|
2017-02-04 04:49:42 +08:00
|
|
|
assert(p);
|
2017-07-26 05:18:02 +08:00
|
|
|
assert(((uintptr_t)p & (alignment - 1)) == 0);
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
free(p);
|
|
|
|
p = aligned_alloc(alignment, size);
|
2017-02-04 04:49:42 +08:00
|
|
|
assert(p);
|
2017-07-26 05:18:02 +08:00
|
|
|
assert(((uintptr_t)p & (alignment - 1)) == 0);
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
free(p);
|
2016-10-01 03:57:21 +08:00
|
|
|
// Tests various combinations of alignment and sizes
|
2016-12-15 00:38:11 +08:00
|
|
|
for (int i = (sizeof(void *) == 4) ? 3 : 4; i < 19; i++) {
|
2016-10-01 03:57:21 +08:00
|
|
|
alignment = 1U << i;
|
|
|
|
for (int j = 1; j < 33; j++) {
|
|
|
|
size = 0x800 * j;
|
|
|
|
for (int k = 0; k < 3; k++) {
|
2016-12-15 00:38:11 +08:00
|
|
|
p = memalign(alignment, size - (2 * sizeof(void *) * k));
|
2017-02-04 04:49:42 +08:00
|
|
|
assert(p);
|
2017-07-26 05:18:02 +08:00
|
|
|
assert(((uintptr_t)p & (alignment - 1)) == 0);
|
2016-10-01 03:57:21 +08:00
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-12-15 00:38:11 +08:00
|
|
|
// For larger alignment, reduce the number of allocations to avoid running
|
|
|
|
// out of potential addresses (on 32-bit).
|
|
|
|
for (int i = 19; i <= 24; i++) {
|
2018-02-27 01:14:44 +08:00
|
|
|
alignment = 1U << i;
|
2016-12-15 00:38:11 +08:00
|
|
|
for (int k = 0; k < 3; k++) {
|
|
|
|
p = memalign(alignment, 0x1000 - (2 * sizeof(void *) * k));
|
2017-02-04 04:49:42 +08:00
|
|
|
assert(p);
|
2017-07-26 05:18:02 +08:00
|
|
|
assert(((uintptr_t)p & (alignment - 1)) == 0);
|
2016-12-15 00:38:11 +08:00
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
}
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
}
|
|
|
|
if (!strcmp(argv[1], "invalid")) {
|
2017-06-30 00:45:20 +08:00
|
|
|
// Alignment is not a power of 2.
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
p = memalign(alignment - 1, size);
|
2018-06-16 00:45:19 +08:00
|
|
|
// CHECK-align: Scudo ERROR: invalid allocation alignment
|
2017-06-30 00:45:20 +08:00
|
|
|
assert(!p);
|
|
|
|
// Size is not a multiple of alignment.
|
|
|
|
p = aligned_alloc(alignment, size >> 1);
|
|
|
|
assert(!p);
|
2017-07-15 05:17:16 +08:00
|
|
|
void *p_unchanged = (void *)0x42UL;
|
|
|
|
p = p_unchanged;
|
2017-06-30 00:45:20 +08:00
|
|
|
// Alignment is not a power of 2.
|
|
|
|
err = posix_memalign(&p, 3, size);
|
2017-07-15 05:17:16 +08:00
|
|
|
assert(p == p_unchanged);
|
2017-06-30 00:45:20 +08:00
|
|
|
assert(err == EINVAL);
|
|
|
|
// Alignment is a power of 2, but not a multiple of size(void *).
|
|
|
|
err = posix_memalign(&p, 2, size);
|
2017-07-15 05:17:16 +08:00
|
|
|
assert(p == p_unchanged);
|
2017-06-30 00:45:20 +08:00
|
|
|
assert(err == EINVAL);
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
}
|
2018-02-27 01:14:44 +08:00
|
|
|
if (!strcmp(argv[1], "double-free")) {
|
|
|
|
void *p = NULL;
|
|
|
|
posix_memalign(&p, 0x100, sizeof(int));
|
|
|
|
assert(p);
|
|
|
|
free(p);
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
if (!strcmp(argv[1], "realloc")) {
|
|
|
|
// We cannot reallocate a memalign'd chunk.
|
|
|
|
void *p = memalign(16, 16);
|
|
|
|
assert(p);
|
|
|
|
p = realloc(p, 32);
|
|
|
|
free(p);
|
|
|
|
}
|
[sanitizer] Initial implementation of a Hardened Allocator
Summary:
This is an initial implementation of a Hardened Allocator based on Sanitizer Common's CombinedAllocator.
It aims at mitigating heap based vulnerabilities by adding several features to the base allocator, while staying relatively fast.
The following were implemented:
- additional consistency checks on the allocation function parameters and on the heap chunks;
- use of checksum protected chunk header, to detect corruption;
- randomness to the allocator base;
- delayed freelist (quarantine), to mitigate use after free and overall determinism.
Additional mitigations are in the works.
Reviewers: eugenis, aizatsky, pcc, krasin, vitalybuka, glider, dvyukov, kcc
Subscribers: kubabrecka, filcab, llvm-commits
Differential Revision: http://reviews.llvm.org/D20084
llvm-svn: 271968
2016-06-07 09:20:26 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2018-02-27 01:14:44 +08:00
|
|
|
|
|
|
|
// CHECK-double-free: ERROR: invalid chunk state
|
|
|
|
// CHECK-realloc: ERROR: allocation type mismatch when reallocating address
|