Skip to content

Add checked shift and allocation size validation in COVER_map_init() #4627

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
nidu-ninja wants to merge 1 commit into
base: dev
Choose a base branch
from
+32 −3
Open

Add checked shift and allocation size validation in COVER_map_init() #4627

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
35 changes: 32 additions & 3 deletions lib/dictBuilder/cover.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ typedef struct COVER_map_s {
U32 sizeMask;
} COVER_map_t;

static int COVER_size_t_mulOverflow(size_t a, size_t b, size_t* result) {
if (a != 0 && b > (size_t)(-1) / a) return 1;
*result = a * b;
return 0;
}

/**
* Clear the map.
*/
Expand All @@ -154,10 +160,33 @@ static void COVER_map_clear(COVER_map_t *map) {
* The map is only guaranteed to be large enough to hold size elements.
*/
static int COVER_map_init(COVER_map_t *map, U32 size) {
map->sizeLog = ZSTD_highbit32(size) + 2;
map->size = (U32)1 << map->sizeLog;
if (size == 0) {
map->sizeLog = 0;
map->size = 0;
return 0;
}

U32 const sizeLog = ZSTD_highbit32(size) + 2;
U32 mapSize;
size_t allocSize;

if (sizeLog >= 32) {
map->sizeLog = 0;
map->size = 0;
return 0;
}

mapSize = (U32)1U << sizeLog;
if (COVER_size_t_mulOverflow((size_t)mapSize, sizeof(COVER_map_pair_t), &allocSize)) {
map->sizeLog = 0;
map->size = 0;
return 0;
}

map->sizeLog = sizeLog;
map->size = mapSize;
map->sizeMask = map->size - 1;
map->data = (COVER_map_pair_t *)malloc(map->size * sizeof(COVER_map_pair_t));
map->data = (COVER_map_pair_t *)malloc(allocSize);
if (!map->data) {
map->sizeLog = 0;
map->size = 0;
Expand Down
Loading