summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/test_overflow.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/test_overflow.c b/lib/test_overflow.c
index 712fb2351c27..f6530fce799d 100644
--- a/lib/test_overflow.c
+++ b/lib/test_overflow.c
@@ -602,10 +602,18 @@ struct __test_flex_array {
static int __init test_overflow_size_helpers(void)
{
+ /* Make sure struct_size() can be used in a constant expression. */
+ u8 ce_array[struct_size((struct __test_flex_array *)0, data, 55)];
struct __test_flex_array *obj;
int count = 0;
int err = 0;
int var;
+ volatile int unconst = 0;
+
+ /* Verify constant expression against runtime version. */
+ var = 55;
+ OPTIMIZER_HIDE_VAR(var);
+ err |= sizeof(ce_array) != struct_size(obj, data, var);
#define check_one_size_helper(expected, func, args...) ({ \
bool __failure = false; \
@@ -663,28 +671,28 @@ static int __init test_overflow_size_helpers(void)
flex_array_size, obj, data, var++);
err |= check_one_size_helper(5 * sizeof(*obj->data),
flex_array_size, obj, data, var++);
- err |= check_one_size_helper(0, flex_array_size, obj, data, 0);
+ err |= check_one_size_helper(0, flex_array_size, obj, data, 0 + unconst);
err |= check_one_size_helper(sizeof(*obj->data),
- flex_array_size, obj, data, 1);
+ flex_array_size, obj, data, 1 + unconst);
err |= check_one_size_helper(7 * sizeof(*obj->data),
- flex_array_size, obj, data, 7);
+ flex_array_size, obj, data, 7 + unconst);
err |= check_one_size_helper(SIZE_MAX,
- flex_array_size, obj, data, -1);
+ flex_array_size, obj, data, -1 + unconst);
err |= check_one_size_helper(SIZE_MAX,
- flex_array_size, obj, data, SIZE_MAX - 4);
+ flex_array_size, obj, data, SIZE_MAX - 4 + unconst);
var = 4;
err |= check_one_size_helper(sizeof(*obj) + (4 * sizeof(*obj->data)),
struct_size, obj, data, var++);
err |= check_one_size_helper(sizeof(*obj) + (5 * sizeof(*obj->data)),
struct_size, obj, data, var++);
- err |= check_one_size_helper(sizeof(*obj), struct_size, obj, data, 0);
+ err |= check_one_size_helper(sizeof(*obj), struct_size, obj, data, 0 + unconst);
err |= check_one_size_helper(sizeof(*obj) + sizeof(*obj->data),
- struct_size, obj, data, 1);
+ struct_size, obj, data, 1 + unconst);
err |= check_one_size_helper(SIZE_MAX,
- struct_size, obj, data, -3);
+ struct_size, obj, data, -3 + unconst);
err |= check_one_size_helper(SIZE_MAX,
- struct_size, obj, data, SIZE_MAX - 3);
+ struct_size, obj, data, SIZE_MAX - 3 + unconst);
pr_info("%d overflow size helper tests finished\n", count);