Skip to content

add additional input sanitation to handlers #240

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

Merged
billphipps merged 3 commits into from
Nov 11, 2025
Merged

add additional input sanitation to handlers #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3a67a
add missing sanitization of input arguments to crypto handlers
bigbrett Nov 10, 2025
7758567
protect input length checks against overflow
bigbrett Nov 10, 2025
b48986b
add more missing checks
bigbrett Nov 10, 2025
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
18 changes: 18 additions & 0 deletions src/wh_server_cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,28 @@ int wh_Server_HandleCertRequest(whServerContext* server, uint16_t magic,
whMessageCert_SimpleResponse resp = {0};
const uint8_t* cert_data;

/* Validate minimum size */
if (req_size < sizeof(whMessageCert_AddTrustedRequest)) {
resp.rc = WH_ERROR_BADARGS;
wh_MessageCert_TranslateSimpleResponse(
magic, &resp, (whMessageCert_SimpleResponse*)resp_packet);
*out_resp_size = sizeof(resp);
break;
}

/* Convert request struct */
wh_MessageCert_TranslateAddTrustedRequest(
magic, (whMessageCert_AddTrustedRequest*)req_packet, &req);

/* Validate certificate data fits within request */
if (req.cert_len > req_size - sizeof(req)) {
resp.rc = WH_ERROR_BADARGS;
wh_MessageCert_TranslateSimpleResponse(
magic, &resp, (whMessageCert_SimpleResponse*)resp_packet);
*out_resp_size = sizeof(resp);
break;
}

/* Get pointer to certificate data */
cert_data = (const uint8_t*)req_packet + sizeof(req);

Expand Down
36 changes: 34 additions & 2 deletions src/wh_server_counter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
const void* req_packet, uint16_t* out_resp_size,
void* resp_packet)
{
(void)req_size;

whKeyId counterId = 0;
int ret = 0;
whNvmMetadata meta[1] = {{0}};
Expand All @@ -59,6 +57,14 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
whMessageCounter_InitRequest req = {0};
whMessageCounter_InitResponse resp = {0};

if (req_size < sizeof(whMessageCounter_InitRequest)) {
resp.rc = WH_ERROR_BADARGS;
(void)wh_MessageCounter_TranslateInitResponse(
magic, &resp, (whMessageCounter_InitResponse*)resp_packet);
*out_resp_size = sizeof(resp);
return WH_ERROR_OK;
}

/* translate request */
(void)wh_MessageCounter_TranslateInitRequest(
magic, (whMessageCounter_InitRequest*)req_packet, &req);
Expand Down Expand Up @@ -87,6 +93,15 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
whMessageCounter_IncrementRequest req = {0};
whMessageCounter_IncrementResponse resp = {0};

if (req_size < sizeof(whMessageCounter_IncrementRequest)) {
resp.rc = WH_ERROR_BADARGS;
(void)wh_MessageCounter_TranslateIncrementResponse(
magic, &resp,
(whMessageCounter_IncrementResponse*)resp_packet);
*out_resp_size = sizeof(resp);
return WH_ERROR_OK;
}

/* translate request */
(void)wh_MessageCounter_TranslateIncrementRequest(
magic, (whMessageCounter_IncrementRequest*)req_packet, &req);
Expand Down Expand Up @@ -133,6 +148,14 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
whMessageCounter_ReadRequest req = {0};
whMessageCounter_ReadResponse resp = {0};

if (req_size < sizeof(whMessageCounter_ReadRequest)) {
resp.rc = WH_ERROR_BADARGS;
(void)wh_MessageCounter_TranslateReadResponse(
magic, &resp, (whMessageCounter_ReadResponse*)resp_packet);
*out_resp_size = sizeof(resp);
return WH_ERROR_OK;
}

/* translate request */
(void)wh_MessageCounter_TranslateReadRequest(
magic, (whMessageCounter_ReadRequest*)req_packet, &req);
Expand Down Expand Up @@ -164,6 +187,15 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
whMessageCounter_DestroyRequest req = {0};
whMessageCounter_DestroyResponse resp = {0};

if (req_size < sizeof(whMessageCounter_DestroyRequest)) {
resp.rc = WH_ERROR_BADARGS;
(void)wh_MessageCounter_TranslateDestroyResponse(
magic, &resp,
(whMessageCounter_DestroyResponse*)resp_packet);
*out_resp_size = sizeof(resp);
return WH_ERROR_OK;
}

/* translate request */
(void)wh_MessageCounter_TranslateDestroyRequest(
magic, (whMessageCounter_DestroyRequest*)req_packet, &req);
Expand Down
Loading