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

fix: resolve UBSAN violations in the codebase #4722

Merged
merged 9 commits into from
Aug 23, 2024
Merged

fix: resolve UBSAN violations in the codebase #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f9fda1
fix: resolve UBSAN violations in the codebase
Aug 21, 2024
54ee04f
fix: presever the original intension of stuffer write and shift funct…
Aug 22, 2024
25bb07b
Run clang-format to properly format the s2n_stuffer.c
Aug 22, 2024
4dc9f80
Address PR comments:
Aug 22, 2024
cafb7b4
Address PR comments:
Aug 22, 2024
ca483f1
Address PR comments:
Aug 22, 2024
9b64d77
Address PR comments:
Aug 23, 2024
87af4c8
Update stuffer/s2n_stuffer.c
boquan-fang Aug 23, 2024
1b85423
Merge branch 'main' into ubsan-fix
boquan-fang Aug 23, 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
12 changes: 11 additions & 1 deletion stuffer/s2n_stuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ int s2n_stuffer_write(struct s2n_stuffer *stuffer, const struct s2n_blob *in)

int s2n_stuffer_write_bytes(struct s2n_stuffer *stuffer, const uint8_t *data, const uint32_t size)
{
if (size == 0) {
return S2N_SUCCESS;
}

POSIX_ENSURE(S2N_MEM_IS_READABLE(data, size), S2N_ERR_SAFETY);
POSIX_PRECONDITION(s2n_stuffer_validate(stuffer));
POSIX_GUARD(s2n_stuffer_skip_write(stuffer, size));
Expand Down Expand Up @@ -437,7 +441,13 @@ int s2n_stuffer_shift(struct s2n_stuffer *stuffer)
POSIX_ENSURE_REF(stuffer);
struct s2n_stuffer copy = *stuffer;
POSIX_GUARD(s2n_stuffer_rewrite(&copy));
uint8_t *data = stuffer->blob.data + stuffer->read_cursor;

uint8_t *data = stuffer->blob.data;
/* Adding 0 to a NULL value is undefined behavior */
if (stuffer->read_cursor != 0) {
data += stuffer->read_cursor;
}

uint32_t data_size = s2n_stuffer_data_available(stuffer);
POSIX_GUARD(s2n_stuffer_write_bytes(&copy, data, data_size));
*stuffer = copy;
Expand Down
8 changes: 7 additions & 1 deletion tests/s2n_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,13 @@ int test_count;
/* for use with S2N_RESULT */
#define EXPECT_OK( function_call ) EXPECT_TRUE( s2n_result_is_ok(function_call) )

#define EXPECT_BYTEARRAY_EQUAL( p1, p2, l ) EXPECT_EQUAL( memcmp( (p1), (p2), (l) ), 0 )
#define EXPECT_BYTEARRAY_EQUAL( p1, p2, l ) \
do { \
if (l != 0) { \
EXPECT_EQUAL( memcmp( (p1), (p2), (l) ), 0 ); \
} \
} while (0)

#define EXPECT_BYTEARRAY_NOT_EQUAL( p1, p2, l ) EXPECT_NOT_EQUAL( memcmp( (p1), (p2), (l) ), 0 )

#define EXPECT_STRING_EQUAL( p1, p2 ) EXPECT_EQUAL( strcmp( (p1), (p2) ), 0 )
Expand Down
7 changes: 6 additions & 1 deletion tests/testlib/s2n_test_server_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,13 @@ S2N_RESULT s2n_negotiate_test_server_and_client_with_early_data(struct s2n_conne
bool server_early_done = false, client_early_done = false;
do {
if (!client_early_done) {
/* Adding 0 to a NULL value is undefined behavior */
uint8_t *next_early_data_to_send = early_data_to_send->data;
if (total_data_sent != 0) {
next_early_data_to_send += total_data_sent;
}
bool success = s2n_send_early_data(client_conn,
early_data_to_send->data + total_data_sent,
next_early_data_to_send,
early_data_to_send->size - total_data_sent,
&data_sent, &blocked)
== S2N_SUCCESS;
Expand Down
Loading