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

Merge pull request #29601 from yuwata/mmap-check-overflow

Browse Source 
mmap: check offset and size more carefully
This commit is contained in:
Luca Boccassi
2023-10-24 12:20:04 +01:00
committed by GitHub
parent 50dbadc9d1 cbdac0c33a
commit e5cd8bc060
27 changed files with 365 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-macro.c
+153
View File
@@ -513,6 +513,34 @@ TEST(align_to) {
assert_se(ALIGN_TO(SIZE_MAX-1, 4) == SIZE_MAX); /* overflow */
assert_se(ALIGN_TO(SIZE_MAX, 4) == SIZE_MAX); /* overflow */
assert_se(ALIGN_TO_U64(0, 1) == 0);
assert_se(ALIGN_TO_U64(1, 1) == 1);
assert_se(ALIGN_TO_U64(2, 1) == 2);
assert_se(ALIGN_TO_U64(3, 1) == 3);
assert_se(ALIGN_TO_U64(4, 1) == 4);
assert_se(ALIGN_TO_U64(UINT64_MAX-1, 1) == UINT64_MAX-1);
assert_se(ALIGN_TO_U64(UINT64_MAX, 1) == UINT64_MAX);
assert_se(ALIGN_TO_U64(0, 2) == 0);
assert_se(ALIGN_TO_U64(1, 2) == 2);
assert_se(ALIGN_TO_U64(2, 2) == 2);
assert_se(ALIGN_TO_U64(3, 2) == 4);
assert_se(ALIGN_TO_U64(4, 2) == 4);
assert_se(ALIGN_TO_U64(UINT64_MAX-3, 2) == UINT64_MAX-3);
assert_se(ALIGN_TO_U64(UINT64_MAX-2, 2) == UINT64_MAX-1);
assert_se(ALIGN_TO_U64(UINT64_MAX-1, 2) == UINT64_MAX-1);
assert_se(ALIGN_TO_U64(UINT64_MAX, 2) == UINT64_MAX); /* overflow */
assert_se(ALIGN_TO_U64(0, 4) == 0);
assert_se(ALIGN_TO_U64(1, 4) == 4);
assert_se(ALIGN_TO_U64(2, 4) == 4);
assert_se(ALIGN_TO_U64(3, 4) == 4);
assert_se(ALIGN_TO_U64(4, 4) == 4);
assert_se(ALIGN_TO_U64(UINT64_MAX-3, 4) == UINT64_MAX-3);
assert_se(ALIGN_TO_U64(UINT64_MAX-2, 4) == UINT64_MAX); /* overflow */
assert_se(ALIGN_TO_U64(UINT64_MAX-1, 4) == UINT64_MAX); /* overflow */
assert_se(ALIGN_TO_U64(UINT64_MAX, 4) == UINT64_MAX); /* overflow */
assert_cc(CONST_ALIGN_TO(96, 512) == 512);
assert_cc(CONST_ALIGN_TO(511, 512) == 512);
assert_cc(CONST_ALIGN_TO(512, 512) == 512);
@@ -523,6 +551,106 @@ TEST(align_to) {
assert_cc(__builtin_types_compatible_p(typeof(CONST_ALIGN_TO(SIZE_MAX, 512)), void));
}
TEST(align_down) {
assert_se(ALIGN_DOWN(0, 1) == 0);
assert_se(ALIGN_DOWN(1, 1) == 1);
assert_se(ALIGN_DOWN(2, 1) == 2);
assert_se(ALIGN_DOWN(3, 1) == 3);
assert_se(ALIGN_DOWN(4, 1) == 4);
assert_se(ALIGN_DOWN(SIZE_MAX-1, 1) == SIZE_MAX-1);
assert_se(ALIGN_DOWN(SIZE_MAX, 1) == SIZE_MAX);
assert_se(ALIGN_DOWN(0, 2) == 0);
assert_se(ALIGN_DOWN(1, 2) == 0);
assert_se(ALIGN_DOWN(2, 2) == 2);
assert_se(ALIGN_DOWN(3, 2) == 2);
assert_se(ALIGN_DOWN(4, 2) == 4);
assert_se(ALIGN_DOWN(SIZE_MAX-1, 2) == SIZE_MAX-1);
assert_se(ALIGN_DOWN(SIZE_MAX, 2) == SIZE_MAX-1);
assert_se(ALIGN_DOWN(0, 4) == 0);
assert_se(ALIGN_DOWN(1, 4) == 0);
assert_se(ALIGN_DOWN(2, 4) == 0);
assert_se(ALIGN_DOWN(3, 4) == 0);
assert_se(ALIGN_DOWN(4, 4) == 4);
assert_se(ALIGN_DOWN(SIZE_MAX-1, 4) == SIZE_MAX-3);
assert_se(ALIGN_DOWN(SIZE_MAX, 4) == SIZE_MAX-3);
assert_se(ALIGN_DOWN_U64(0, 1) == 0);
assert_se(ALIGN_DOWN_U64(1, 1) == 1);
assert_se(ALIGN_DOWN_U64(2, 1) == 2);
assert_se(ALIGN_DOWN_U64(3, 1) == 3);
assert_se(ALIGN_DOWN_U64(4, 1) == 4);
assert_se(ALIGN_DOWN_U64(UINT64_MAX-1, 1) == UINT64_MAX-1);
assert_se(ALIGN_DOWN_U64(UINT64_MAX, 1) == UINT64_MAX);
assert_se(ALIGN_DOWN_U64(0, 2) == 0);
assert_se(ALIGN_DOWN_U64(1, 2) == 0);
assert_se(ALIGN_DOWN_U64(2, 2) == 2);
assert_se(ALIGN_DOWN_U64(3, 2) == 2);
assert_se(ALIGN_DOWN_U64(4, 2) == 4);
assert_se(ALIGN_DOWN_U64(UINT64_MAX-1, 2) == UINT64_MAX-1);
assert_se(ALIGN_DOWN_U64(UINT64_MAX, 2) == UINT64_MAX-1);
assert_se(ALIGN_DOWN_U64(0, 4) == 0);
assert_se(ALIGN_DOWN_U64(1, 4) == 0);
assert_se(ALIGN_DOWN_U64(2, 4) == 0);
assert_se(ALIGN_DOWN_U64(3, 4) == 0);
assert_se(ALIGN_DOWN_U64(4, 4) == 4);
assert_se(ALIGN_DOWN_U64(UINT64_MAX-1, 4) == UINT64_MAX-3);
assert_se(ALIGN_DOWN_U64(UINT64_MAX, 4) == UINT64_MAX-3);
}
TEST(align_offset) {
assert_se(ALIGN_OFFSET(0, 1) == 0);
assert_se(ALIGN_OFFSET(1, 1) == 0);
assert_se(ALIGN_OFFSET(2, 1) == 0);
assert_se(ALIGN_OFFSET(3, 1) == 0);
assert_se(ALIGN_OFFSET(4, 1) == 0);
assert_se(ALIGN_OFFSET(SIZE_MAX-1, 1) == 0);
assert_se(ALIGN_OFFSET(SIZE_MAX, 1) == 0);
assert_se(ALIGN_OFFSET(0, 2) == 0);
assert_se(ALIGN_OFFSET(1, 2) == 1);
assert_se(ALIGN_OFFSET(2, 2) == 0);
assert_se(ALIGN_OFFSET(3, 2) == 1);
assert_se(ALIGN_OFFSET(4, 2) == 0);
assert_se(ALIGN_OFFSET(SIZE_MAX-1, 2) == 0);
assert_se(ALIGN_OFFSET(SIZE_MAX, 2) == 1);
assert_se(ALIGN_OFFSET(0, 4) == 0);
assert_se(ALIGN_OFFSET(1, 4) == 1);
assert_se(ALIGN_OFFSET(2, 4) == 2);
assert_se(ALIGN_OFFSET(3, 4) == 3);
assert_se(ALIGN_OFFSET(4, 4) == 0);
assert_se(ALIGN_OFFSET(SIZE_MAX-1, 4) == 2);
assert_se(ALIGN_OFFSET(SIZE_MAX, 4) == 3);
assert_se(ALIGN_OFFSET_U64(0, 1) == 0);
assert_se(ALIGN_OFFSET_U64(1, 1) == 0);
assert_se(ALIGN_OFFSET_U64(2, 1) == 0);
assert_se(ALIGN_OFFSET_U64(3, 1) == 0);
assert_se(ALIGN_OFFSET_U64(4, 1) == 0);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX-1, 1) == 0);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX, 1) == 0);
assert_se(ALIGN_OFFSET_U64(0, 2) == 0);
assert_se(ALIGN_OFFSET_U64(1, 2) == 1);
assert_se(ALIGN_OFFSET_U64(2, 2) == 0);
assert_se(ALIGN_OFFSET_U64(3, 2) == 1);
assert_se(ALIGN_OFFSET_U64(4, 2) == 0);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX-1, 2) == 0);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX, 2) == 1);
assert_se(ALIGN_OFFSET_U64(0, 4) == 0);
assert_se(ALIGN_OFFSET_U64(1, 4) == 1);
assert_se(ALIGN_OFFSET_U64(2, 4) == 2);
assert_se(ALIGN_OFFSET_U64(3, 4) == 3);
assert_se(ALIGN_OFFSET_U64(4, 4) == 0);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX-1, 4) == 2);
assert_se(ALIGN_OFFSET_U64(UINT64_MAX, 4) == 3);
}
TEST(flags) {
enum {
F1 = 1 << 0,
@@ -884,4 +1012,29 @@ TEST(round_up) {
TEST_ROUND_UP_BY_TYPE(uint64_t, UINT64_MAX);
}
TEST(u64_multiply_safe) {
assert_se(u64_multiply_safe(0, 0) == 0);
assert_se(u64_multiply_safe(10, 0) == 0);
assert_se(u64_multiply_safe(0, 10) == 0);
assert_se(u64_multiply_safe(10, 10) == 100);
assert_se(u64_multiply_safe(UINT64_MAX, 0) == 0);
assert_se(u64_multiply_safe(UINT64_MAX, 1) == UINT64_MAX);
assert_se(u64_multiply_safe(UINT64_MAX, 2) == 0);
assert_se(u64_multiply_safe(0, UINT64_MAX) == 0);
assert_se(u64_multiply_safe(1, UINT64_MAX) == UINT64_MAX);
assert_se(u64_multiply_safe(2, UINT64_MAX) == 0);
assert_se(u64_multiply_safe(UINT64_MAX / 2, 0) == 0);
assert_se(u64_multiply_safe(UINT64_MAX / 2, 1) == UINT64_MAX / 2);
assert_se(u64_multiply_safe(UINT64_MAX / 2, 2) == UINT64_MAX - 1);
assert_se(u64_multiply_safe(UINT64_MAX / 2, 3) == 0);
assert_se(u64_multiply_safe(0, UINT64_MAX / 2) == 0);
assert_se(u64_multiply_safe(1, UINT64_MAX / 2) == UINT64_MAX / 2);
assert_se(u64_multiply_safe(2, UINT64_MAX / 2) == UINT64_MAX - 1);
assert_se(u64_multiply_safe(3, UINT64_MAX / 2) == 0);
assert_se(u64_multiply_safe(UINT64_MAX, UINT64_MAX) == 0);
}
DEFINE_TEST_MAIN(LOG_INFO);
src/test/test-memory-util.c
+70
View File
@@ -52,4 +52,74 @@ TEST(cleanup_array) {
free(saved_iov);
}
TEST(page_align) {
assert_se(PAGE_ALIGN(page_size() - 1) == page_size());
assert_se(PAGE_ALIGN(page_size() ) == page_size());
assert_se(PAGE_ALIGN(page_size() + 1) == page_size() * 2);
assert_se(PAGE_ALIGN(page_size() * 123 - 1) == page_size() * 123);
assert_se(PAGE_ALIGN(page_size() * 123 ) == page_size() * 123);
assert_se(PAGE_ALIGN(page_size() * 123 + 1) == page_size() * 124);
assert_se(PAGE_ALIGN(SIZE_MAX - page_size() - 1) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN(SIZE_MAX - page_size() ) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN(SIZE_MAX - page_size() + 1) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN(SIZE_MAX - page_size() + 2) == SIZE_MAX); /* overflow */
assert_se(PAGE_ALIGN(SIZE_MAX) == SIZE_MAX); /* overflow */
assert_se(PAGE_ALIGN_U64(page_size() - 1) == page_size());
assert_se(PAGE_ALIGN_U64(page_size() ) == page_size());
assert_se(PAGE_ALIGN_U64(page_size() + 1) == page_size() * 2);
assert_se(PAGE_ALIGN_U64(page_size() * 123 - 1) == page_size() * 123);
assert_se(PAGE_ALIGN_U64(page_size() * 123 ) == page_size() * 123);
assert_se(PAGE_ALIGN_U64(page_size() * 123 + 1) == page_size() * 124);
assert_se(PAGE_ALIGN_U64(UINT64_MAX - page_size() - 1) == UINT64_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_U64(UINT64_MAX - page_size() ) == UINT64_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_U64(UINT64_MAX - page_size() + 1) == UINT64_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_U64(UINT64_MAX - page_size() + 2) == UINT64_MAX); /* overflow */
assert_se(PAGE_ALIGN_U64(UINT64_MAX) == UINT64_MAX); /* overflow */
assert_se(PAGE_ALIGN_DOWN(page_size() - 1) == 0);
assert_se(PAGE_ALIGN_DOWN(page_size() ) == page_size());
assert_se(PAGE_ALIGN_DOWN(page_size() + 1) == page_size());
assert_se(PAGE_ALIGN_DOWN(page_size() * 123 - 1) == page_size() * 122);
assert_se(PAGE_ALIGN_DOWN(page_size() * 123 ) == page_size() * 123);
assert_se(PAGE_ALIGN_DOWN(page_size() * 123 + 1) == page_size() * 123);
assert_se(PAGE_ALIGN_DOWN(SIZE_MAX - page_size() - 1) == SIZE_MAX - page_size() * 2 + 1);
assert_se(PAGE_ALIGN_DOWN(SIZE_MAX - page_size() ) == SIZE_MAX - page_size() * 2 + 1);
assert_se(PAGE_ALIGN_DOWN(SIZE_MAX - page_size() + 1) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_DOWN(SIZE_MAX - page_size() + 2) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_DOWN_U64(page_size() - 1) == 0);
assert_se(PAGE_ALIGN_DOWN_U64(page_size() ) == page_size());
assert_se(PAGE_ALIGN_DOWN_U64(page_size() + 1) == page_size());
assert_se(PAGE_ALIGN_DOWN_U64(page_size() * 123 - 1) == page_size() * 122);
assert_se(PAGE_ALIGN_DOWN_U64(page_size() * 123 ) == page_size() * 123);
assert_se(PAGE_ALIGN_DOWN_U64(page_size() * 123 + 1) == page_size() * 123);
assert_se(PAGE_ALIGN_DOWN_U64(SIZE_MAX - page_size() - 1) == SIZE_MAX - page_size() * 2 + 1);
assert_se(PAGE_ALIGN_DOWN_U64(SIZE_MAX - page_size() ) == SIZE_MAX - page_size() * 2 + 1);
assert_se(PAGE_ALIGN_DOWN_U64(SIZE_MAX - page_size() + 1) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_ALIGN_DOWN_U64(SIZE_MAX - page_size() + 2) == SIZE_MAX - page_size() + 1);
assert_se(PAGE_OFFSET(page_size() - 1) == page_size() - 1);
assert_se(PAGE_OFFSET(page_size() ) == 0);
assert_se(PAGE_OFFSET(page_size() + 1) == 1);
assert_se(PAGE_OFFSET(page_size() * 123 - 1) == page_size() - 1);
assert_se(PAGE_OFFSET(page_size() * 123 ) == 0);
assert_se(PAGE_OFFSET(page_size() * 123 + 1) == 1);
assert_se(PAGE_OFFSET(SIZE_MAX - page_size() - 1) == page_size() - 2);
assert_se(PAGE_OFFSET(SIZE_MAX - page_size() ) == page_size() - 1);
assert_se(PAGE_OFFSET(SIZE_MAX - page_size() + 1) == 0);
assert_se(PAGE_OFFSET(SIZE_MAX - page_size() + 2) == 1);
assert_se(PAGE_OFFSET_U64(page_size() - 1) == page_size() - 1);
assert_se(PAGE_OFFSET_U64(page_size() ) == 0);
assert_se(PAGE_OFFSET_U64(page_size() + 1) == 1);
assert_se(PAGE_OFFSET_U64(page_size() * 123 - 1) == page_size() - 1);
assert_se(PAGE_OFFSET_U64(page_size() * 123 ) == 0);
assert_se(PAGE_OFFSET_U64(page_size() * 123 + 1) == 1);
assert_se(PAGE_OFFSET_U64(UINT64_MAX - page_size() - 1) == page_size() - 2);
assert_se(PAGE_OFFSET_U64(UINT64_MAX - page_size() ) == page_size() - 1);
assert_se(PAGE_OFFSET_U64(UINT64_MAX - page_size() + 1) == 0);
assert_se(PAGE_OFFSET_U64(UINT64_MAX - page_size() + 2) == 1);
}
DEFINE_TEST_MAIN(LOG_INFO);