Skip to contentSkip to conversation

efi_loader: efi_variable_parse_signature() returns NULL on error

PATCH Patrick Wildt 3 participants 5 messages May 7, 2020

lore
Share & tools
lore
#0 lore raw

efi_variable_parse_signature() returns NULL on error, so IS_NULL() is an incorrect check. The goto err leads to pkcs7_free_message(), which works fine on a NULL ptr.

lib/efi_loader/efi_variable.c +1 -2
index 58f8fae358..c5fe896de2 100644
@@ -519,9 +519,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}
 
Reviewed-by
#1 lore raw
Quoted 5 lines · Patrick Wildt

efi_variable_parse_signature() returns NULL on error, so IS_NULL() is an incorrect check. The goto err leads to pkcs7_free_message(), which works fine on a NULL ptr.

Quoted 16 lines
lib/efi_loader/efi_variable.c +1 -2
index 58f8fae358..c5fe896de2 100644
@@ -519,9 +519,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}
 
Reviewed-by
#2 lore raw
In reply to Patrick Wildt
Quoted 5 lines · Patrick Wildt

efi_variable_parse_signature() returns NULL on error, so IS_NULL() is an incorrect check. The goto err leads to pkcs7_free_message(), which works fine on a NULL ptr.

Quoted 16 lines
lib/efi_loader/efi_variable.c +1 -2
index 58f8fae358..c5fe896de2 100644
@@ -519,9 +519,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}
 
#3 lore raw
Quoted 2 lines · AKASHI Takahiro
Quoted 1 line · Patrick Wildt

efi_variable_parse_signature() returns NULL on error, so IS_NULL()

IS_NULL() seems to be a typo. I will replace it by IS_ERR() when merging.

Quoted 6 lines
Quoted 4 lines

is an incorrect check. The goto err leads to pkcs7_free_message(), which works fine on a NULL ptr.

Hello Takahiro,

there is a second instance of the same error:

lib/efi_loader/efi_variable.c:412:

??????? msg = pkcs7_parse_message(ebuf, ebuflen);
??????? free(ebuf);
out:
????????if (IS_ERR(msg))
????????????????return NULL;

Please, send a patch for that one too.

Best regards

Heinrich

Quoted 17 lines
Quoted 17 lines
lib/efi_loader/efi_variable.c +1 -2
index 58f8fae358..c5fe896de2 100644
@@ -519,9 +519,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}
 
#4 lore raw
Quoted 5 lines · Heinrich Schuchardt
Quoted 2 lines · AKASHI Takahiro
Quoted 1 line · Patrick Wildt

efi_variable_parse_signature() returns NULL on error, so IS_NULL()

IS_NULL() seems to be a typo. I will replace it by IS_ERR() when merging.

Hi,

Yes, sorry.

Quoted 19 lines
Quoted 6 lines
Quoted 4 lines

is an incorrect check. The goto err leads to pkcs7_free_message(), which works fine on a NULL ptr.

Hello Takahiro,

there is a second instance of the same error:

lib/efi_loader/efi_variable.c:412:

??????? msg = pkcs7_parse_message(ebuf, ebuflen);
??????? free(ebuf);
out:
????????if (IS_ERR(msg))
????????????????return NULL;

Quoted 5 lines

Please, send a patch for that one too.

Best regards

Heinrich

No, that is ok. pkcs7_parse_message() returns an ERR_PTR() on failure, as you saw in my other diff. That's why IS_ERR(msg) is fine here, and we can return NULL.

Best regards,
Patrick

Quoted 18 lines
Quoted 17 lines
Quoted 17 lines
lib/efi_loader/efi_variable.c +1 -2
index 58f8fae358..c5fe896de2 100644
@@ -519,9 +519,8 @@ static efi_status_t efi_variable_authenticate(u16 *variable,
 	var_sig = efi_variable_parse_signature(auth->auth_info.cert_data,
 					       auth->auth_info.hdr.dwLength
 						   - sizeof(auth->auth_info));
-	if (IS_ERR(var_sig)) {
+	if (!var_sig) {
 		debug("Parsing variable's signature failed\n");
-		var_sig = NULL;
 		goto err;
 	}