lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/test_stackinit: Fix static initializer test

Browse Source 
commit f9398f15605a50110bf570aaa361163a85113dd1 upstream.

The static initializer test got accidentally converted to a dynamic
initializer. Fix this and retain the giant padding hole without using
an aligned struct member.

Fixes: 50ceaa95ea ("lib: Introduce test_stackinit module")
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210723221933.3431999-2-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2021-07-23 15:19:31 -07:00 committed by Greg Kroah-Hartman
parent 3c232895b8
commit c1f12f440c
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/test_stackinit.c
View File

@ -67,10 +67,10 @@ static bool range_contains(char *haystack_start, size_t haystack_size,
#define INIT_STRUCT_none /**/ #define INIT_STRUCT_none /**/
#define INIT_STRUCT_zero = { } #define INIT_STRUCT_zero = { }
#define INIT_STRUCT_static_partial = { .two = 0, } #define INIT_STRUCT_static_partial = { .two = 0, }
#define INIT_STRUCT_static_all = { .one = arg->one, \ #define INIT_STRUCT_static_all = { .one = 0, \
.two = arg->two, \ .two = 0, \
.three = arg->three, \ .three = 0, \
.four = arg->four, \ .four = 0, \
} }
#define INIT_STRUCT_dynamic_partial = { .two = arg->two, } #define INIT_STRUCT_dynamic_partial = { .two = arg->two, }
#define INIT_STRUCT_dynamic_all = { .one = arg->one, \ #define INIT_STRUCT_dynamic_all = { .one = arg->one, \
@ -84,8 +84,7 @@ static bool range_contains(char *haystack_start, size_t haystack_size,
var.one = 0; \ var.one = 0; \
var.two = 0; \ var.two = 0; \
var.three = 0; \ var.three = 0; \
memset(&var.four, 0, \ var.four = 0
sizeof(var.four))
/* /*
* @name: unique string name for the test * @name: unique string name for the test
@ -208,18 +207,13 @@ struct test_small_hole {
unsigned long four; unsigned long four;
}; };
/* Try to trigger unhandled padding in a structure. */ /* Trigger unhandled padding in a structure. */
struct test_aligned {
u32 internal1;
u64 internal2;
} __aligned(64);
struct test_big_hole { struct test_big_hole {
u8 one; u8 one;
u8 two; u8 two;
u8 three; u8 three;
/* 61 byte padding hole here. */ /* 61 byte padding hole here. */
struct test_aligned four; u8 four __aligned(64);
} __aligned(64); } __aligned(64);
struct test_trailing_hole { struct test_trailing_hole {