Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(test): narrow valgrind suppressions #4369

Merged
merged 11 commits into from
Mar 20, 2024
Merged

fix(test): narrow valgrind suppressions #4369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be223c4
correct valgrind suppression
jmayclin Jan 18, 2024
0133021
Merge branch 'main' into fix-valgrind-errors
jmayclin Jan 27, 2024
55c62f1
address ci feedback
jmayclin Jan 27, 2024
b3dd054
address pr feedback
jmayclin Jan 31, 2024
2910e92
address pr feedback
jmayclin Mar 5, 2024
6b83d98
update comment
jmayclin Mar 5, 2024
43fb856
Merge branch 'main' into fix-valgrind-errors
dougch Mar 13, 2024
8a0bc57
address pr feedback
jmayclin Mar 14, 2024
322844a
Merge branch 'main' into fix-valgrind-errors
dougch Mar 14, 2024
b89127e
Merge branch 'main' into fix-valgrind-errors
jmayclin Mar 19, 2024
acc0985
Merge branch 'main' into fix-valgrind-errors
jmayclin Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codebuild/bin/s2n_codebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [[ "$OS_NAME" == "linux" && "$TESTS" == "valgrind" ]]; then
# and will not produce any output
while sleep 9m; do echo "=====[ $SECONDS seconds still running ]====="; done &

if [[ "$S2N_LIBCRYPTO" == "openssl-1.1.1" || "$S2N_LIBCRYPTO" == "awslc" ]]; then
if [[ "$S2N_LIBCRYPTO" == "openssl-1.1.1" ]]; then
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
# https://github.com/aws/s2n-tls/issues/3758
# Run valgrind in pedantic mode (--errors-for-leak-kinds=all)
echo "running task pedantic_valgrind"
Expand Down
26 changes: 24 additions & 2 deletions tests/unit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,37 @@ $(VALGRIND_TESTS)::
@DYLD_LIBRARY_PATH="$(LIBCRYPTO_ROOT)/lib:$$DYLD_LIBRARY_PATH" \
LD_LIBRARY_PATH="$(LIBCRYPTO_ROOT)/lib:$$LD_LIBRARY_PATH" \
S2N_VALGRIND=1 \
valgrind --leak-check=full --run-libc-freeres=no -q --error-exitcode=9 --gen-suppressions=all --log-fd=2 --num-callers=40 --leak-resolution=high --undef-value-errors=no --trace-children=yes --suppressions=valgrind.suppressions \
valgrind \
--leak-check=full \
--leak-resolution=high \
--trace-children=yes \
--run-libc-freeres=no \
-q --error-exitcode=123 \
--error-limit=no \
--num-callers=40 \
--undef-value-errors=no \
--log-fd=2 \
--suppressions=valgrind.suppressions \
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
./$(@:.valgrind=)

$(PEDANTIC_VALGRIND_TESTS)::
@${CC} ${CFLAGS} -o $(@:.pedantic_valgrind=) $(@:.pedantic_valgrind=.c) ${LDFLAGS} 2>&1
@DYLD_LIBRARY_PATH="$(LIBCRYPTO_ROOT)/lib:$$DYLD_LIBRARY_PATH" \
LD_LIBRARY_PATH="$(LIBCRYPTO_ROOT)/lib:$$LD_LIBRARY_PATH" \
S2N_VALGRIND=1 \
valgrind --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all --run-libc-freeres=yes -q --error-exitcode=9 --gen-suppressions=all --num-callers=40 --leak-resolution=high --undef-value-errors=no --trace-children=yes --suppressions=valgrind.suppressions \
valgrind \
--leak-check=full \
--leak-resolution=high \
--trace-children=yes \
--run-libc-freeres=yes \
-q --error-exitcode=123 \
--error-limit=no \
--num-callers=40 \
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
--undef-value-errors=no \
--show-leak-kinds=all \
--errors-for-leak-kinds=all \
--gen-suppressions=all \
--suppressions=valgrind.suppressions \
./$(@:.pedantic_valgrind=)

.PHONY : valgrind
Expand Down
44 changes: 30 additions & 14 deletions tests/unit/s2n_examples_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,40 +213,44 @@ static S2N_RESULT s2n_test_example_recv_echo(struct s2n_connection *conn,
typedef S2N_RESULT (*s2n_test_scenario)(struct s2n_connection *conn, struct s2n_blob *input);
static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
{
DEFER_CLEANUP(struct s2n_cert_chain_and_key *chain_and_key = NULL,
s2n_cert_chain_and_key_ptr_free);
struct s2n_cert_chain_and_key *chain_and_key = NULL;
RESULT_GUARD_POSIX(s2n_test_cert_chain_and_key_new(&chain_and_key,
S2N_DEFAULT_TEST_CERT_CHAIN, S2N_DEFAULT_TEST_PRIVATE_KEY));

DEFER_CLEANUP(struct s2n_config *config = s2n_config_new(),
s2n_config_ptr_free);
struct s2n_config *config = s2n_config_new();
RESULT_ENSURE_REF(config);
RESULT_GUARD_POSIX(s2n_config_set_unsafe_for_testing(config));
RESULT_GUARD_POSIX(s2n_config_set_cipher_preferences(config, "default_tls13"));
RESULT_GUARD_POSIX(s2n_config_add_cert_chain_and_key_to_store(config, chain_and_key));

DEFER_CLEANUP(struct s2n_test_io_pair io_pair = { 0 }, s2n_io_pair_close);
RESULT_GUARD_POSIX(s2n_io_pair_init_non_blocking(&io_pair));

DEFER_CLEANUP(struct s2n_blob input = { 0 }, s2n_free);
struct s2n_blob input = { 0 };
RESULT_GUARD_POSIX(s2n_alloc(&input, S2N_TEST_BYTES_TO_SEND));
RESULT_GUARD(s2n_get_public_random_data(&input));

DEFER_CLEANUP(struct s2n_test_io_pair io_pair = { 0 }, s2n_io_pair_close);
RESULT_GUARD_POSIX(s2n_io_pair_init_non_blocking(&io_pair));

pid_t client_pid = fork();
if (client_pid == 0) {
/* Suppress stdout when running the examples.
* This only affects the new client process.
*/
fclose(stdout);

DEFER_CLEANUP(struct s2n_connection *client = s2n_connection_new(S2N_CLIENT),
s2n_connection_ptr_free);
struct s2n_connection *client = s2n_connection_new(S2N_CLIENT);
EXPECT_NOT_NULL(client);
EXPECT_SUCCESS(s2n_connection_set_config(client, config));

EXPECT_SUCCESS(s2n_io_pair_close_one_end(&io_pair, S2N_SERVER));
EXPECT_SUCCESS(s2n_connection_set_io_pair(client, &io_pair));

EXPECT_OK(scenario_fn(client, &input));

EXPECT_SUCCESS(s2n_connection_free(client));
EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));
EXPECT_SUCCESS(s2n_free(&input));

exit(EXIT_SUCCESS);
}

Expand All @@ -257,15 +261,19 @@ static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
*/
fclose(stdout);

DEFER_CLEANUP(struct s2n_connection *server = s2n_connection_new(S2N_SERVER),
s2n_connection_ptr_free);
struct s2n_connection *server = s2n_connection_new(S2N_SERVER);
EXPECT_SUCCESS(s2n_connection_set_config(server, config));

EXPECT_SUCCESS(s2n_io_pair_close_one_end(&io_pair, S2N_CLIENT));
EXPECT_SUCCESS(s2n_connection_set_io_pair(server, &io_pair));

EXPECT_OK(scenario_fn(server, &input));

EXPECT_SUCCESS(s2n_connection_free(server));
EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));
EXPECT_SUCCESS(s2n_free(&input));

exit(EXIT_SUCCESS);
}

Expand All @@ -275,6 +283,10 @@ static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
RESULT_ENSURE_EQ(waitpid(server_pid, &status, 0), server_pid);
RESULT_ENSURE_EQ(status, EXIT_SUCCESS);

EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));
EXPECT_SUCCESS(s2n_free(&input));

return S2N_RESULT_OK;
}

Expand All @@ -283,8 +295,8 @@ static S2N_RESULT s2n_run_failure_tests()
uint8_t buffer[100] = { 0 };
size_t buffer_size = sizeof(buffer);

DEFER_CLEANUP(struct s2n_connection *conn = s2n_connection_new(S2N_CLIENT),
s2n_connection_ptr_free);
struct s2n_connection *conn = s2n_connection_new(S2N_CLIENT);
EXPECT_NOT_NULL(conn);
EXPECT_SUCCESS(s2n_connection_set_blinding(conn, S2N_SELF_SERVICE_BLINDING));

pid_t pid = fork();
Expand All @@ -301,13 +313,17 @@ static S2N_RESULT s2n_run_failure_tests()
EXPECT_EQUAL(s2n_example_recv(conn, buffer, buffer_size), S2N_FAILURE);
EXPECT_EQUAL(s2n_example_recv_echo(conn, buffer, buffer_size), S2N_FAILURE);

EXPECT_SUCCESS(s2n_connection_free(conn));

exit(EXIT_SUCCESS);
}

int status = 0;
RESULT_ENSURE_EQ(waitpid(pid, &status, 0), pid);
RESULT_ENSURE_EQ(status, EXIT_SUCCESS);

EXPECT_SUCCESS(s2n_connection_free(conn));

return S2N_RESULT_OK;
}

Expand Down
16 changes: 12 additions & 4 deletions tests/unit/s2n_key_update_threads_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,12 @@ static S2N_RESULT s2n_test_peer_requests(struct s2n_connection *conn)
typedef S2N_RESULT (*s2n_test_scenario)(struct s2n_connection *conn);
static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
{
DEFER_CLEANUP(struct s2n_cert_chain_and_key *chain_and_key = NULL,
s2n_cert_chain_and_key_ptr_free);
struct s2n_cert_chain_and_key *chain_and_key = NULL;
RESULT_GUARD_POSIX(s2n_test_cert_chain_and_key_new(&chain_and_key,
S2N_DEFAULT_TEST_CERT_CHAIN, S2N_DEFAULT_TEST_PRIVATE_KEY));

DEFER_CLEANUP(struct s2n_config *config = s2n_config_new(),
s2n_config_ptr_free);
struct s2n_config *config = s2n_config_new();
RESULT_ENSURE_REF(config);
RESULT_GUARD_POSIX(s2n_config_set_unsafe_for_testing(config));
RESULT_GUARD_POSIX(s2n_config_set_cipher_preferences(config, "default_tls13"));
RESULT_GUARD_POSIX(s2n_config_add_cert_chain_and_key_to_store(config, chain_and_key));
Expand All @@ -207,6 +206,9 @@ static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
EXPECT_OK(scenario_fn(client));

EXPECT_SUCCESS(s2n_connection_free(client));
EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));

exit(EXIT_SUCCESS);
}

Expand All @@ -227,6 +229,9 @@ static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
EXPECT_OK(scenario_fn(server));

EXPECT_SUCCESS(s2n_connection_free(server));
EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));

exit(EXIT_SUCCESS);
}

Expand All @@ -236,6 +241,9 @@ static S2N_RESULT s2n_run_self_talk_test(s2n_test_scenario scenario_fn)
RESULT_ENSURE_EQ(waitpid(server_pid, &status, 0), server_pid);
RESULT_ENSURE_EQ(status, EXIT_SUCCESS);

EXPECT_SUCCESS(s2n_cert_chain_and_key_free(chain_and_key));
EXPECT_SUCCESS(s2n_config_free(config));

return S2N_RESULT_OK;
}

Expand Down
59 changes: 58 additions & 1 deletion tests/unit/valgrind.suppressions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,68 @@
fun:main
}

# TODO: fix the pedantic leak errors from s2n_self_talk_alpn_test
# START: s2n_self_talk_alpn_test suppressions
# https://github.com/aws/s2n-tls/issues/1600
{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_cert_chain_and_key_new
fun:main
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_config_add_cert_chain_and_key_to_store
fun:main
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_cert_chain_and_key_load_pem
fun:main
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_config_new
fun:main
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_config_set_protocol_preferences
fun:main
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:malloc
fun:main
}

{
ignore_s2n_self_talk_alpn_test
Memcheck:Leak
match-leak-kinds: reachable
...
fun:s2n_config_add_dhparams
fun:main
}
# END: s2n_self_talk_alpn_test suppressions
Loading