Skip to content

Commit eecb03b

Browse files
committed
Merge tag 'execve-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve update from Kees Cook: - drop duplicate bprm_stack_limits test vectors (Titouan Ameline de Cadeville) * tag 'execve-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: fs/tests: exec: drop duplicate bprm_stack_limits test vectors
2 parents 1562b1f + 46a03ea commit eecb03b

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

fs/tests/exec_kunit.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ static const struct bprm_stack_limits_result bprm_stack_limits_results[] = {
8787
.argc = 0, .envc = ARG_MAX / sizeof(void *) - 1 },
8888
.expected_argmin = ULONG_MAX - sizeof(void *) },
8989
/* Raising rlim_stack / 4 to _STK_LIM / 4 * 3 will see more space. */
90-
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * (_STK_LIM / 4 * 3),
91-
.argc = 0, .envc = 0 },
92-
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
9390
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * (_STK_LIM / 4 * 3),
9491
.argc = 0, .envc = 0 },
9592
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
@@ -103,9 +100,6 @@ static const struct bprm_stack_limits_result bprm_stack_limits_results[] = {
103100
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * _STK_LIM,
104101
.argc = 0, .envc = 0 },
105102
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
106-
{ { .p = ULONG_MAX, .rlim_stack.rlim_cur = 4 * _STK_LIM,
107-
.argc = 0, .envc = 0 },
108-
.expected_argmin = ULONG_MAX - (_STK_LIM / 4 * 3) + sizeof(void *) },
109103
};
110104

111105
static void exec_test_bprm_stack_limits(struct kunit *test)

0 commit comments

Comments
 (0)