Skip to content

Zendesk Coverity changes #822

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
ejohnstown merged 3 commits into from
Jul 23, 2025
Merged

Zendesk Coverity changes #822

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a76e80f
AlgoListSz returns 0 if algoList is NULL
rlm2002 Jul 14, 2025
13a1c4a
check ssh->ctx before dereferencing
rlm2002 Jul 21, 2025
4796e34
add ret checks for WS_SUCCESS to prevent dereference after null check
rlm2002 Jul 21, 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
63 changes: 37 additions & 26 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3988,6 +3988,9 @@ static word32 AlgoListSz(const char* algoList)
{
word32 algoListSz;

if (algoList == NULL)
return 0;

algoListSz = (word32)WSTRLEN(algoList);
if (algoList[algoListSz-1] == ',') {
--algoListSz;
Expand Down Expand Up @@ -13318,7 +13321,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptName, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
Expand All @@ -13328,7 +13332,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptInstruction, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
Expand All @@ -13338,7 +13343,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptLanguage, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
Expand Down Expand Up @@ -13370,33 +13376,38 @@ int SendUserAuthKeyboardRequest(WOLFSSH* ssh, WS_UserAuthData* authData)
WLOG(WS_LOG_DEBUG, "Entering SendUserAuthKeyboardRequest()");


if (ssh == NULL || authData == NULL) {
ret = WS_BAD_ARGUMENT;
if (ssh == NULL || ssh->ctx == NULL|| authData == NULL) {
return WS_BAD_ARGUMENT;
}

if (ssh->ctx->keyboardAuthCb == NULL) {
WLOG(WS_LOG_DEBUG, "SendUserAuthKeyboardRequest called with no Cb set");
ret = WS_BAD_USAGE;
if (ret == WS_SUCCESS){
if (ssh->ctx->keyboardAuthCb == NULL) {
WLOG(WS_LOG_DEBUG, "SendUserAuthKeyboardRequest called with no Cb set");
return WS_BAD_USAGE;
}
else {
ret = ssh->ctx->keyboardAuthCb(&authData->sf.keyboard,
ssh->keyboardAuthCtx);
}
}

if (ret == WS_SUCCESS) {
ret = ssh->ctx->keyboardAuthCb(&authData->sf.keyboard,
ssh->keyboardAuthCtx);
}

if (authData->sf.keyboard.promptCount > 0 &&
(authData->sf.keyboard.prompts == NULL ||
authData->sf.keyboard.promptLengths == NULL ||
authData->sf.keyboard.promptEcho == NULL)) {

ret = WS_BAD_USAGE;
if (authData->sf.keyboard.promptCount > 0 &&
(authData->sf.keyboard.prompts == NULL ||
authData->sf.keyboard.promptLengths == NULL ||
authData->sf.keyboard.promptEcho == NULL)) {
ret = WS_BAD_USAGE;
}
}

if (authData->sf.keyboard.promptCount > WOLFSSH_MAX_PROMPTS) {
ret = WS_BAD_USAGE;
if (ret == WS_SUCCESS) {
if (authData->sf.keyboard.promptCount > WOLFSSH_MAX_PROMPTS) {
ret = WS_BAD_USAGE;
}
}

ssh->kbAuth.promptCount = authData->sf.keyboard.promptCount;
if (ret == WS_SUCCESS)
ssh->kbAuth.promptCount = authData->sf.keyboard.promptCount;

payloadSz = MSG_ID_SZ;
if (ret == WS_SUCCESS) {
Expand All @@ -13407,12 +13418,12 @@ int SendUserAuthKeyboardRequest(WOLFSSH* ssh, WS_UserAuthData* authData)
ret = PreparePacket(ssh, payloadSz);
}

output = ssh->outputBuffer.buffer;
idx = ssh->outputBuffer.length;
if (ret == WS_SUCCESS) {
output = ssh->outputBuffer.buffer;
idx = ssh->outputBuffer.length;

output[idx++] = MSGID_USERAUTH_INFO_REQUEST;
output[idx++] = MSGID_USERAUTH_INFO_REQUEST;

if (ret == WS_SUCCESS) {
ret = BuildUserAuthRequestKeyboard(ssh, output, &idx, authData);
}

Expand Down Expand Up @@ -15117,7 +15128,7 @@ static int GetAllowedAuth(WOLFSSH* ssh, char* authStr)

typeAllowed |= WOLFSSH_USERAUTH_PASSWORD;
#ifdef WOLFSSH_KEYBOARD_INTERACTIVE
if (ssh->ctx->keyboardAuthCb != NULL) {
if (ssh->ctx && ssh->ctx->keyboardAuthCb) {
typeAllowed |= WOLFSSH_USERAUTH_KEYBOARD;
}
#endif
Expand Down
Loading