Skip to content

wh_client: fix: cap labelSz and add defensive NULL checks #234

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 1 commit into from
Dec 12, 2025
Merged

wh_client: fix: cap labelSz and add defensive NULL checks #234

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
27 changes: 12 additions & 15 deletions src/wh_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,10 @@ int wh_Client_CommInfoResponse(whClientContext* c,
if (out_cfg_keycache_bufsize != NULL) {
*out_cfg_keycache_bufsize = msg.cfg_server_keycache_bufsize;
}
if (out_cfg_keycache_count != NULL) {
if (out_cfg_keycache_bigcount != NULL) {
*out_cfg_keycache_bigcount = msg.cfg_server_keycache_bigcount;
}
if (out_cfg_keycache_bufsize != NULL) {
if (out_cfg_keycache_bigbufsize != NULL) {
*out_cfg_keycache_bigbufsize = msg.cfg_server_keycache_bigbufsize;
}
if (out_cfg_customcb_count != NULL) {
Expand Down Expand Up @@ -731,6 +731,7 @@ int wh_Client_KeyCacheRequest_ex(whClientContext* c, uint32_t flags,
{
whMessageKeystore_CacheRequest* req = NULL;
uint8_t* packIn;
uint16_t capSz;

if (c == NULL || in == NULL || inSz == 0 ||
sizeof(*req) + inSz > WOLFHSM_CFG_COMM_DATA_LEN) {
Expand All @@ -751,14 +752,10 @@ int wh_Client_KeyCacheRequest_ex(whClientContext* c, uint32_t flags,
req->labelSz = 0;
}
else {
req->labelSz = labelSz;
/* write label */
if (labelSz > WH_NVM_LABEL_LEN) {
memcpy(req->label, label, WH_NVM_LABEL_LEN);
}
else {
memcpy(req->label, label, labelSz);
}
capSz = (labelSz > WH_NVM_LABEL_LEN) ? WH_NVM_LABEL_LEN : labelSz;
req->labelSz = capSz;
memcpy(req->label, label, capSz);
}

/* write in */
Expand Down Expand Up @@ -1343,6 +1340,7 @@ int wh_Client_KeyCacheDmaRequest(whClientContext* c, uint32_t flags,
int ret;
whMessageKeystore_CacheDmaRequest* req = NULL;
uintptr_t keyAddrPtr = 0;
uint16_t capSz = 0;

if (c == NULL || (labelSz > 0 && label == NULL)) {
return WH_ERROR_BADARGS;
Expand All @@ -1355,7 +1353,7 @@ int wh_Client_KeyCacheDmaRequest(whClientContext* c, uint32_t flags,
memset(req, 0, sizeof(*req));
req->id = keyId;
req->flags = flags;
req->labelSz = labelSz;
req->labelSz = 0;

/* Set up DMA buffer info */
req->key.sz = keySz;
Expand All @@ -1365,11 +1363,10 @@ int wh_Client_KeyCacheDmaRequest(whClientContext* c, uint32_t flags,
req->key.addr = keyAddrPtr;

/* Copy label if provided, truncate if necessary */
if (labelSz > 0) {
if (labelSz > WH_NVM_LABEL_LEN) {
labelSz = WH_NVM_LABEL_LEN;
}
memcpy(req->label, label, labelSz);
if (labelSz > 0 && label != NULL) {
capSz = (labelSz > WH_NVM_LABEL_LEN) ? WH_NVM_LABEL_LEN : labelSz;
req->labelSz = capSz;
memcpy(req->label, label, capSz);
}

if (ret == WH_ERROR_OK) {
Expand Down