efi_loader: add missing EFI_EXIT in efi_disconnect_controller
PATCH 1/1 efi_loader: add missing EFI_EXIT in efi_disconnect_controller
Make sure to call EFI_EXIT() in efi_disconnect_controller(), when returning after having called EFI_ENTRY().
This is inspired by a barebox fix. [1]
--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/efi_loader/efi_boottime.c +1 -1
@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );if (child_handle) {
Signature · 1 line
2.53.0
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support EFI_LOADER now? I wish we could bring these projects back together :-)
Quoted 25 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-2@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );if (child_handle) { --
Quoted 2 lines
2.53.0
Regards,
Simon
Hi Vincent,
Quoted 30 lines · Simon Glass
Hi Vincent,
Quoted 2 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), whenreturning
Quoted 3 lines
after having called
EFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)Quoted 2 lines
Link:
https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69
[1]Quoted 1 line
Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for solechild")
Review
Quoted 9 lines
Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/lib/efi_loader/efi_boottime.c
Quoted 10 lines
lib/efi_loader/efi_boottime.c efi_status_t EFIAPI efi_disconnect_controller( · line 3898
Quoted 9 lines
index
de57823bd44..b6966652d97100644lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r);
Any reason we can just goto out;
Thanks
/Ilias
Quoted 10 lines
Quoted 6 lines
lib/efi_loader/efi_boottime.c +0
-1sole_child = (number_of_children ==1 );if (child_handle) { --2.53.0
Regards,
Simon
Quoted 29 lines · Ilias Apalodimas
Hi Vincent,
Quoted 24 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)Quoted 11 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
Quoted 10 lines
lib/efi_loader/efi_boottime.c efi_status_t EFIAPI efi_disconnect_controller( · line 3898
Quoted 10 lines
lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r);Any reason we can just goto out;
+1...every other error path uses 'goto out' so the single EFI_EXIT() at the bottom handles things - child_handle_buffer is initialised to NULL so the free() at out is safe.
Quoted 9 lines
Thanks
/IliasQuoted 6 lines
Quoted 6 lines
lib/efi_loader/efi_boottime.c +0
-1sole_child = (number_of_children ==1 );if (child_handle) { --2.53.0
Regards,
Simon
Quoted 45 lines · Simon Glass
Quoted 29 lines · Ilias Apalodimas
Hi Vincent,
Quoted 24 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)Quoted 11 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 13 lines
Quoted 10 lines
lib/efi_loader/efi_boottime.c efi_status_t EFIAPI efi_disconnect_controller( · line 3898
Quoted 10 lines
lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r);Any reason we can just goto out;
Quoted 3 lines
+1...every other error path uses 'goto out' so the single
EFI_EXIT()at the bottom handles things -child_handle_bufferis initialised to NULL so thefree()at out is safe.
Hi,
I think you are right; I will send a v2.
Best regards,
Vincent.
Quoted 13 lines
Quoted 10 lines
Thanks
/IliasQuoted 6 lines
Quoted 6 lines
lib/efi_loader/efi_boottime.c +0
-1sole_child = (number_of_children ==1 );if (child_handle) { --2.53.0
Regards,
Simon
Hello,
Quoted 11 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)
It's not as extensive as U-Boot's yet, but it's usable for the common boot me a distro GRUB use case. The code originated from U-Boot with some parts heavily rewritten to fit barebox, e.g. the EFI filesystem protocol is implemented on top of dirfds, so it reuses VFS path handling and other such things.
The imported files have Origin-URL comments pointing back at U-Boot including the revision they originated from, but we are still in need of better tooling to make use of these tags.
@Vincent, I suspect a number of fixes in [1] are also applicable to U-Boot, but I haven't checked.
[1]:
https://lore.kernel.org/barebox/[email protected]/
Cheers,
Ahmad
Quoted 32 lines
Quoted 26 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-2@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );if (child_handle) { --Quoted 2 lines
2.53.0
Regards,
Simon
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hi Ahmad,
Quoted 13 lines · Ahmad Fatoum
Hello,
Quoted 9 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Quoted 8 lines
Quoted 2 lines
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)It's not as extensive as U-Boot's yet, but it's usable for the common boot me a distro GRUB use case. The code originated from U-Boot with some parts heavily rewritten to fit barebox, e.g. the EFI filesystem protocol is implemented on top of dirfds, so it reuses VFS path handling and other such things.
OK good. I did create a VFS in Concept but I have not tried to get it into mainline yet.
Quoted 4 lines
The imported files have Origin-URL comments pointing back at U-Boot including the revision they originated from, but we are still in need of better tooling to make use of these tags.
On another topic - where did we get to with the whole-FITsigning thing? Should we set up a call to talk it through?
Regards,
Simon
Quoted 51 lines
@Vincent, I suspect a number of fixes in [1] are also applicable to U-Boot, but I haven't checked.
[1]:
https://lore.kernel.org/barebox/[email protected]/Cheers,
AhmadQuoted 24 lines
Quoted 24 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );Quoted 8 lines
Quoted 4 lines
lib/efi_loader/efi_boottime.c +0
-1if (child_handle) { --2.53.0
Regards,
Simon--
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hello Simon,
Quoted 19 lines · Simon Glass
Hi Ahmad,
Quoted 16 lines · Ahmad Fatoum
Hello,
Quoted 11 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)
Quoted 8 lines
Quoted 5 lines
It's not as extensive as U-Boot's yet, but it's usable for the common boot me a distro GRUB use case. The code originated from U-Boot with some parts heavily rewritten to fit barebox, e.g. the EFI filesystem protocol is implemented on top of dirfds, so it reuses VFS path handling and other such things.
OK good. I did create a VFS in Concept but I have not tried to get it into mainline yet.
Cool. I really look forward to cp /dev/sd /dev/emmc just working :-)
Quoted 6 lines
Quoted 3 lines
The imported files have Origin-URL comments pointing back at U-Boot including the revision they originated from, but we are still in need of better tooling to make use of these tags.
On another topic - where did we get to with the whole-FITsigning thing? Should we set up a call to talk it through?
This is still something I am interested in landing. I had started a review of your counterproposal, but got distracted before finishing it. I submitted it now.
Cheers,
Ahmad
Quoted 56 lines
Regards,
SimonQuoted 51 lines
@Vincent, I suspect a number of fixes in [1] are also applicable to U-Boot, but I haven't checked.
[1]:
https://lore.kernel.org/barebox/[email protected]/Cheers,
AhmadQuoted 24 lines
Quoted 24 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );Quoted 8 lines
Quoted 4 lines
lib/efi_loader/efi_boottime.c +0
-1if (child_handle) { --2.53.0
Regards,
Simon--
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hi Ahmad,
Quoted 29 lines · Ahmad Fatoum
Hello Simon,
Quoted 25 lines · Simon Glass
Hi Ahmad,
Quoted 21 lines · Ahmad Fatoum
Hello,
Quoted 11 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow? I wish we could bring these projects back together :-)It's not as extensive as U-Boot's yet, but it's usable for the common boot me a distro GRUB use case. The code originated from U-Boot with some parts heavily rewritten to fit barebox, e.g. the EFI filesystem protocol is implemented on top of dirfds, so it reuses VFS path handling and other such things.
Quoted 4 lines
Quoted 2 lines
OK good. I did create a VFS in Concept but I have not tried to get it into mainline yet.
Cool. I really look forward to
cp /dev/sd /dev/emmcjust working :-)
Well, you can copy:
=> mount hostfs . host
=> fs cp host/README host/Kconfig
81004 bytes copied
=>
but there is no device fs :-(
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
The imported files have Origin-URL comments pointing back at U-Boot including the revision they originated from, but we are still in need of better tooling to make use of these tags.
Quoted 6 lines
Quoted 2 lines
On another topic - where did we get to with the whole-FITsigning thing? Should we set up a call to talk it through?
This is still something I am interested in landing. I had started a review of your counterproposal, but got distracted before finishing it. I submitted it now.
OK great, thanks, will take a look.
Quoted 44 lines
Cheers,
AhmadQuoted 40 lines
Regards,
SimonQuoted 36 lines
@Vincent, I suspect a number of fixes in [1] are also applicable to U-Boot, but I haven't checked.
[1]:
https://lore.kernel.org/barebox/[email protected]/Cheers,
AhmadQuoted 24 lines
Quoted 24 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-1@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
lib/efi_loader/efi_boottime.c +0
-1if (child_handle) { --2.53.0
Regards,
Simon
Quoted 10 lines · Simon Glass
Hi Vincent,
Quoted 5 lines · Vincent Stehlé
Make sure to call
EFI_EXIT()inefi_disconnect_controller(), when returning after having calledEFI_ENTRY().This is inspired by a barebox fix. [1]
Hmm, does Barebox support
EFI_LOADERnow?
Hi Simon,
It does now: https://www.mail-archive.com/[email protected]/msg56391.html
Best regards,
Vincent.
Quoted 33 lines
I wish we could bring these
projects back together :-)Quoted 25 lines
Link https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69 [1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>--- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-2@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; +return EFI_EXIT (r); sole_child = (number_of_children ==1 );if (child_handle) { --Quoted 2 lines
2.53.0
Regards,
Simon
Signature · 1 line
Vincent.
PATCH v2 1/1 efi_loader: fix missing EFI_EXIT in efi_disconnect_controller
In reply to Vincent StehléWe are missing a call to EFI_EXIT() when returning from efi_disconnect_controller(), which we need after having called EFI_ENTRY().
Fix this by jumping to the common error path, which does call EFI_EXIT().
Even though the common error path may try to free child_handle_buffer, this cannot harm in our case as it always NULL.
This is inspired by a barebox fix. [1]
---
Changes for v2:
- Drop the return and jump to the common error path with a goto instead
lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/efi_loader/efi_boottime.c +1 -1
@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; + goto out; sole_child = (number_of_children ==1 );if (child_handle) {
Signature · 1 line
2.53.0
Re: [PATCH v2] efi_loader: fix missing EFI_EXIT in efi_disconnect_controller
Thanks Vincent,
Quoted 10 lines · Vincent Stehlé
We are missing a call to
EFI_EXIT()when returning fromefi_disconnect_controller(), which we need after having calledEFI_ENTRY().Fix this by jumping to the common error path, which does call
EFI_EXIT().Even though the common error path may try to free
child_handle_buffer, this cannot harm in our case as it always NULL.This is inspired by a barebox fix. [1]
There's more in that link and some of them are still valid. Do you plan to send more?
Quoted 11 lines
Link:
https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69[1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for solechild")
Signed-off-by Vincent Stehlé <[email protected]>Cc Heinrich Schuchardt <[email protected]>Cc Ilias Apalodimas <[email protected]>Cc Tom Rini <[email protected]>---
Quoted 26 lines
Changes for v2:
- Drop the return and jump to the common error path with a goto insteadlib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-2@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer);if (r !=EFI_SUCCESS ) -return r; + goto out; sole_child = (number_of_children ==1 );if (child_handle) { --2.53.0
Re: [PATCH v2] efi_loader: fix missing EFI_EXIT in efi_disconnect_controller
Quoted 8 lines · Ilias Apalodimas
Thanks Vincent,
Quoted 4 lines · Vincent Stehlé
We are missing a call to
EFI_EXIT()when returning fromefi_disconnect_controller(), which we need after having calledEFI_ENTRY().Fix this by jumping to the common error path, which does call
EFI_EXIT().
Quoted 7 lines
Quoted 4 lines
Even though the common error path may try to free
child_handle_buffer, this cannot harm in our case as it always NULL.This is inspired by a barebox fix. [1]
There's more in that link and some of them are still valid. Do you plan to send more?
Hi Ilias,
I am trying to, but... I have looked at the barebox fixes and I think they necessitate a triaging and verification effort.
- Some fixes are not applicable to U-Boot (e.g. [1]).
- Some fixes look applicable to U-Boot but in fact are not (I tried to reproduce
[2] on U-Boot with a unit test for example, but I could not make the test fail).
- Some fixes look applicable but I would like to verify completeness (I am looking at [3] for example).
- And last but not least, some fixes are difficult for me to review.
This makes me think that we should try to create a "reproducer" in lib/efi_selftest/ systematically for each fix to the EFI Loader.
Best regards,
Vincent.
[1] https://git.pengutronix.de/cgit/barebox/commit/efi/loader?id=f34f05ff87cf3a0a9f7345227f9a080ddcf3ec48
[2] https://git.pengutronix.de/cgit/barebox/commit/efi/loader?id=cbe4bd04edec9c1d3c843fcc22e1a7ae5c9c4551
[3] https://git.pengutronix.de/cgit/barebox/commit/efi/loader?id=4e9944e5cd1170cb5c54f97f4e12ddeccba53e55
Quoted 46 lines
Quoted 10 lines
Link:
[2]https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69[1]Fixes 314bed6c854e ("efi_loader: fix DisconnectController() for sole child")Signed-off-by Vincent Stehlé <[3][email protected]>Cc Heinrich Schuchardt <[4][email protected]>Cc Ilias Apalodimas <[5][email protected]>Cc Tom Rini <[6][email protected]>---
Reviewed-by Ilias Apalodimas <[7][email protected]>Quoted 20 lines
Changes for v2:
- Drop the return and jump to the common error path with a goto insteadlib/efi_loader/efi_boottime.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)lib/efi_loader/efi_boottime.c +1
-2@@ -3895,7 +3895,7 @@ efi_status_t EFIAPI efi_disconnect_controller( &number_of_children, &child_handle_buffer); if (r != EFI_SUCCESS) - return r; + goto out; sole_child = (number_of_children == 1); if (child_handle) { --Quoted 1 line
2.53.0
References
Visible links
1. mailto:[email protected]
2. https://git.pengutronix.de/cgit/barebox/commit/?id=080db65e39a877b000baaf843c997a69821dfe69
3. mailto:[email protected]
4. mailto:[email protected]
5. mailto:[email protected]
6. mailto:[email protected]
7. mailto:[email protected]
Signature · 1 line
Vincent.