Skip to content

Fix heap buffer overflow in BundlePacket #775

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

Closed
devin-ai-integration wants to merge 1 commit into from
Closed

Fix heap buffer overflow in BundlePacket #775

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
14 changes: 12 additions & 2 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10057,7 +10057,11 @@ static int PreparePacket(WOLFSSH* ssh, word32 payloadSz)
word32 packetSz, outputSz;
byte paddingSz;

paddingSz = ssh->blockSz * 2;
/* Ensure enough space for worst-case padding scenario:
* - At least MIN_PAD_LENGTH (4)
* - Plus potentially another blockSz for alignment
* This gives us a safe upper bound */
paddingSz = ssh->blockSz * 3;
packetSz = PAD_LENGTH_SZ + payloadSz + paddingSz;
outputSz = LENGTH_SZ + packetSz + ssh->macSz;

Expand Down Expand Up @@ -10109,8 +10113,14 @@ static int BundlePacket(WOLFSSH* ssh)

/* Add the padding */
WLOG(WS_LOG_DEBUG, "BP: paddingSz = %u", paddingSz);
if (ssh->encryptId == ID_NONE)
/* Verify we have enough space for padding */
if (idx + paddingSz > ssh->outputBuffer.bufferSz) {
ret = WS_BUFFER_E;
WLOG(WS_LOG_DEBUG, "BP: buffer too small for padding");
}
else if (ssh->encryptId == ID_NONE) {
WMEMSET(output + idx, 0, paddingSz);
}
else if (wc_RNG_GenerateBlock(ssh->rng, output + idx, paddingSz) < 0) {
ret = WS_CRYPTO_FAILED;
WLOG(WS_LOG_DEBUG, "BP: failed to add padding");
Expand Down
Loading