Skip to content

Check RNG response length before copying inline payload #463

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
yosuke-wolfssl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check RNG response length before copying inline payload #463

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
19 changes: 15 additions & 4 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,13 @@ int wh_Client_RngGenerateResponse(whClientContext* ctx, uint8_t* out,

ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_RNG, (uint8_t**)&res);
if (ret == WH_ERROR_OK) {
if (res->sz > WH_MESSAGE_CRYPTO_RNG_MAX_INLINE_SZ ||
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
/* Reject a size the received message does not actually carry, or that
* exceeds the inline cap or the caller's buffer. */
if (res_len < hdr_sz || res->sz > (res_len - hdr_sz) ||
res->sz > WH_MESSAGE_CRYPTO_RNG_MAX_INLINE_SZ ||
res->sz > *inout_size) {
/* Server returned more than the inline cap or the caller's buffer
* can hold. Guard the inline cap first to avoid reading past the
* comm buffer on a malformed response. */
ret = WH_ERROR_ABORTED;
}
else {
Expand Down Expand Up @@ -399,6 +401,15 @@ int wh_Client_RngGenerateDmaResponse(whClientContext* ctx)
ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_RNG, (uint8_t**)&resp);
/* On success, server has written random bytes directly to client
* memory — nothing else to copy. */
if (ret == WH_ERROR_OK) {
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*resp);
/* Nothing here is read inline; the bound just holds a success rc
* to a full response (an error reply carries only the header). */
if (respSz < hdr_sz) {
ret = WH_ERROR_ABORTED;
}
}
}

/* POST DMA cleanup using stashed addresses (runs on every non-NOTREADY
Expand Down
Loading