Skip to content

openssl: fix malloc/realloc possible overflow #8245

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

Open
esemeniuc wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

openssl: fix malloc/realloc possible overflow #8245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/waltz/openssl/fd_openssl_tile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ crypto_malloc( ulong num,
int line ) {
(void)file;
(void)line;
void * result = fd_alloc_malloc( fd_ossl_alloc, 8UL, num + 8UL );
ulong alloc_sz;
if( FD_UNLIKELY( __builtin_uaddl_overflow( num, 8UL, &alloc_sz ) ) ) {
fd_ossl_alloc_errors++;
return NULL;
}
void * result = fd_alloc_malloc( fd_ossl_alloc, 8UL, alloc_sz );
if( FD_UNLIKELY( !result ) ) {
fd_ossl_alloc_errors++;
return NULL;
Expand Down Expand Up @@ -66,7 +71,12 @@ crypto_realloc( void * addr,
return NULL;
}

void * new = fd_alloc_malloc( fd_ossl_alloc, 8UL, num + 8UL );
ulong alloc_sz;
if( FD_UNLIKELY( __builtin_uaddl_overflow( num, 8UL, &alloc_sz ) ) ) {
fd_ossl_alloc_errors++;
return NULL;
}
void * new = fd_alloc_malloc( fd_ossl_alloc, 8UL, alloc_sz );
if( FD_UNLIKELY( !new ) ) return NULL;

ulong old_num = *(ulong*)( (uchar*)addr - 8UL );
Expand Down