Skip to content

Validate inSize before translating fixed crypto requests #466

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

Validate inSize before translating fixed crypto requests #466

Show file tree
Hide file tree
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
43 changes: 25 additions & 18 deletions src/wh_server_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,13 +1169,15 @@ static int _HandleEccKeyGen(whServerContext* ctx, uint16_t magic, int devId,
const void* cryptoDataIn, uint16_t inSize,
void* cryptoDataOut, uint16_t* outSize)
{
(void)inSize;

int ret = WH_ERROR_OK;
ecc_key key[1];
whMessageCrypto_EccKeyGenRequest req;
whMessageCrypto_EccKeyGenResponse res;

if (inSize < sizeof(whMessageCrypto_EccKeyGenRequest)) {
return WH_ERROR_BADARGS;
}

/* Translate request */
ret = wh_MessageCrypto_TranslateEccKeyGenRequest(
magic, (const whMessageCrypto_EccKeyGenRequest*)cryptoDataIn, &req);
Expand Down Expand Up @@ -2030,13 +2032,15 @@ static int _HandleCurve25519KeyGen(whServerContext* ctx, uint16_t magic,
uint16_t inSize, void* cryptoDataOut,
uint16_t* outSize)
{
(void)inSize;

int ret = WH_ERROR_OK;
curve25519_key key[1];
whMessageCrypto_Curve25519KeyGenRequest req;
whMessageCrypto_Curve25519KeyGenResponse res;

if (inSize < sizeof(whMessageCrypto_Curve25519KeyGenRequest)) {
return WH_ERROR_BADARGS;
}

/* Translate request */
ret = wh_MessageCrypto_TranslateCurve25519KeyGenRequest(
magic, (const whMessageCrypto_Curve25519KeyGenRequest*)cryptoDataIn,
Expand Down Expand Up @@ -2262,13 +2266,15 @@ static int _HandleEd25519KeyGen(whServerContext* ctx, uint16_t magic, int devId,
const void* cryptoDataIn, uint16_t inSize,
void* cryptoDataOut, uint16_t* outSize)
{
(void)inSize;

int ret = WH_ERROR_OK;
ed25519_key key[1];
whMessageCrypto_Ed25519KeyGenRequest req;
whMessageCrypto_Ed25519KeyGenResponse res;

if (inSize < sizeof(whMessageCrypto_Ed25519KeyGenRequest)) {
return WH_ERROR_BADARGS;
}

ret = wh_MessageCrypto_TranslateEd25519KeyGenRequest(
magic, (const whMessageCrypto_Ed25519KeyGenRequest*)cryptoDataIn, &req);
if (ret != 0) {
Expand Down Expand Up @@ -4736,13 +4742,15 @@ static int _HandleMlDsaKeyGen(whServerContext* ctx, uint16_t magic, int devId,
(void)outSize;
return WH_ERROR_NOHANDLER;
#else
(void)inSize;

int ret = WH_ERROR_OK;
wc_MlDsaKey key[1];
whMessageCrypto_MlDsaKeyGenRequest req;
whMessageCrypto_MlDsaKeyGenResponse res;

if (inSize < sizeof(whMessageCrypto_MlDsaKeyGenRequest)) {
return WH_ERROR_BADARGS;
}

/* Translate the request */
ret = wh_MessageCrypto_TranslateMlDsaKeyGenRequest(
magic, (whMessageCrypto_MlDsaKeyGenRequest*)cryptoDataIn, &req);
Expand Down Expand Up @@ -4846,13 +4854,15 @@ static int _HandleMlDsaSign(whServerContext* ctx, uint16_t magic, int devId,
(void)outSize;
return WH_ERROR_NOHANDLER;
#else
(void)inSize;

int ret;
wc_MlDsaKey key[1];
whMessageCrypto_MlDsaSignRequest req;
whMessageCrypto_MlDsaSignResponse res;

if (inSize < sizeof(whMessageCrypto_MlDsaSignRequest)) {
return WH_ERROR_BADARGS;
}

/* Translate the request */
ret = wh_MessageCrypto_TranslateMlDsaSignRequest(
magic, (whMessageCrypto_MlDsaSignRequest*)cryptoDataIn, &req);
Expand All @@ -4879,11 +4889,7 @@ static int _HandleMlDsaSign(whServerContext* ctx, uint16_t magic, int devId,
}
}

/* Validate input length against available data to prevent buffer overread
*/
if (inSize < sizeof(whMessageCrypto_MlDsaSignRequest)) {
return WH_ERROR_BADARGS;
}
/* Validate the declared lengths against the remaining payload */
word32 available_data = inSize - sizeof(whMessageCrypto_MlDsaSignRequest);
if (in_len > available_data) {
return WH_ERROR_BADARGS;
Expand Down Expand Up @@ -4958,6 +4964,10 @@ static int _HandleMlDsaVerify(whServerContext* ctx, uint16_t magic, int devId,
whMessageCrypto_MlDsaVerifyRequest req;
whMessageCrypto_MlDsaVerifyResponse res;

if (inSize < sizeof(whMessageCrypto_MlDsaVerifyRequest)) {
return WH_ERROR_BADARGS;
}

/* Translate the request */
ret = wh_MessageCrypto_TranslateMlDsaVerifyRequest(
magic, (whMessageCrypto_MlDsaVerifyRequest*)cryptoDataIn, &req);
Expand Down Expand Up @@ -4987,9 +4997,6 @@ static int _HandleMlDsaVerify(whServerContext* ctx, uint16_t magic, int devId,
}

/* Validate lengths against available payload (overflow-safe) */
if (inSize < sizeof(whMessageCrypto_MlDsaVerifyRequest)) {
return WH_ERROR_BADARGS;
}
uint32_t available = inSize - sizeof(whMessageCrypto_MlDsaVerifyRequest);
if ((sig_len > available) || (hash_len > available) ||
(sig_len > (available - hash_len))) {
Expand Down
Loading
Loading