Skip to content

Conversation

@ardbiesheuvel
Copy link
Member

@ardbiesheuvel ardbiesheuvel commented Dec 5, 2025

A recent series of CodeQL inspired patches introduced bugs and regressed the boot on some platforms.

Given that the author currently appears unavailable for addressing these issues, revert them so it can be revisited at a later time.

This reverts commit 6d4fbc0.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This reverts commit 1097edb.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This reverts commit 2fd6884.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This reverts commit 901c4e3.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This reverts commit 8c92e6e.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This reverts commit 5214f93.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
if (PlatformDefaultBootOptionValid && PcdGetBool (PcdPlatformRecoverySupport)) {
LoadOptions = EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOptionTypePlatformRecovery);
if ((LoadOptions != NULL) && (EfiBootManagerFindLoadOption (&PlatformDefaultBootOption, LoadOptions, LoadOptionCount) == -1)) {
if (EfiBootManagerFindLoadOption (&PlatformDefaultBootOption, LoadOptions, LoadOptionCount) == -1) {

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
ProcessLoadOptions (LoadOptions, LoadOptionCount);
EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);
}
ProcessLoadOptions (LoadOptions, LoadOptionCount);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
ProcessLoadOptions (LoadOptions, LoadOptionCount);
EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);
}
ProcessLoadOptions (LoadOptions, LoadOptionCount);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
if (PreviousMenuOption != NULL) {
*SkipValue = PreviousMenuOption->Skip - Rows;
}
*SkipValue = PreviousMenuOption->Skip - Rows;

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
RefreshKeyHelp (gFormData, SavedMenuOption->ThisTag, FALSE);
}

RefreshKeyHelp (gFormData, SavedMenuOption->ThisTag, FALSE);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
CurrentExpression->TimeOut = ((EFI_IFR_WARNING_IF *)OpCodeData)->TimeOut;
CurrentExpression->Type = EFI_HII_EXPRESSION_WARNING_IF;
if (ParentStatement != NULL) {
InsertTailList (&ParentStatement->WarningListHead, &CurrentExpression->Link);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
if (ParentStatement != NULL) {
InsertTailList (&ParentStatement->NestStatementList, &DisplayStatement->DisplayLink);
}
InsertTailList (&ParentStatement->NestStatementList, &DisplayStatement->DisplayLink);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
}

NextElementBakup = NextRequestElement;
NextRequestElement = StrStr (RequestElement, ValueKey);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
//
// Replace "&" with '\0'.
//
*NextRequestElement = L'\0';

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
} else {
if (RespString && (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {
NextElementBakup = NextRequestElement;
NextRequestElement = StrStr (RequestElement, ValueKey);

Check failure

Code scanning / CodeQL

Returned pointer not checked High

Value may be null; it should be checked before dereferencing.
@mergify
Copy link

mergify bot commented Dec 6, 2025

PR can not be merged due to conflict. Please rebase and resubmit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant