Re: [U-Boot] [PATCH v6 4/7] cmd: efidebug: add drivers command

On Tue, Feb 19, 2019 at 08:49:30PM +0100, Heinrich Schuchardt wrote:

On 1/24/19 12:04 PM, AKASHI Takahiro wrote:

...

"drivers" command prints all the uefi drivers on the system.

=> efi drivers Driver Name Image Path ================ ==================== ==================== 000000007ef003d0 <NULL> <built-in>

Signed-off-by: AKASHI Takahiro takahiro.akashi@linaro.org

cmd/efidebug.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 8a7f775b117a..1b788c76a895 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -111,6 +111,80 @@ static int do_efi_show_devices(cmd_tbl_t *cmdtp, int flag, return CMD_RET_SUCCESS; }

+static int efi_get_driver_handle_info(efi_handle_t handle, u16 **driver_name,

• 		      u16 **image_path)
  

+{

• struct efi_handler *handler;
• struct efi_loaded_image *image;
• efi_status_t ret;
• /*

• * driver name
  

• * TODO: support EFI_COMPONENT_NAME2_PROTOCOL
  

• */
  

• *driver_name = NULL;
• /* image name */
• ret = efi_search_protocol(handle, &efi_guid_loaded_image, &handler);
• if (ret != EFI_SUCCESS) {

• *image_path = NULL;
  

• return 0;
  

• }
• image = handler->protocol_interface;
• *image_path = efi_dp_str(image->file_path);
• return 0;

+}

+static int do_efi_show_drivers(cmd_tbl_t *cmdtp, int flag,

• 	       int argc, char * const argv[])
  

+{

• efi_handle_t *handles = NULL, *handle;
• efi_uintn_t size = 0;
• u16 *driver_name, *image_path_text;
• efi_status_t ret;
• int i;

You are duplicating the logic of LocateHandleBuffer(). Why?

Will fix.

...

• ret = BS->locate_handle(BY_PROTOCOL, &efi_guid_driver_binding_protocol,

• 		NULL, &size, NULL);
  

• if (ret == EFI_BUFFER_TOO_SMALL) {

• handles = calloc(1, size);
  

• if (!handles)
  

• 	return CMD_RET_FAILURE;
  

• ret = BS->locate_handle(BY_PROTOCOL,
  

• 			&efi_guid_driver_binding_protocol,
  

• 			NULL, &size, handles);
  

• }
• if (ret != EFI_SUCCESS) {

• free(handles);
  

• return CMD_RET_FAILURE;
  

• }
• printf("Driver%.*s Name Image Path\n",

•       EFI_HANDLE_WIDTH - 6, spc);
  

• printf("%.*s ==================== ====================\n",

•       EFI_HANDLE_WIDTH, sep);
  

• handle = handles;
• for (i = 0; i < size / sizeof(*handle); i++) {

• if (!efi_get_driver_handle_info(*handle, &driver_name,
  

• 				&image_path_text)) {
  

• 	if (image_path_text)
  

• 		printf("%p %-20ls %ls\n",
  

• 		       *handle, driver_name, image_path_text);
  

• 	else
  

• 		printf("%p %-20ls <built-in>\n",
  

• 		       *handle, driver_name);
  

• 	efi_free_pool(driver_name);
  

• 	efi_free_pool(image_path_text);
  

• }
  

• handle++;
  

• }

You are leaking 'handles' here.

Will fix.

Thanks, -Takahiro Akashi

Best regards

Heinrich

...

• return CMD_RET_SUCCESS;

+}

static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -504,6 +578,8 @@ static cmd_tbl_t cmd_efidebug_sub[] = { U_BOOT_CMD_MKENT(boot, CONFIG_SYS_MAXARGS, 1, do_efi_boot_opt, "", ""), U_BOOT_CMD_MKENT(devices, CONFIG_SYS_MAXARGS, 1, do_efi_show_devices, "", ""),

• U_BOOT_CMD_MKENT(drivers, CONFIG_SYS_MAXARGS, 1, do_efi_show_drivers,

• 	 "", ""),
  

};

/* Interpreter command to configure UEFI environment */ @@ -551,7 +627,9 @@ static char efidebug_help_text[] = " - set/show UEFI boot order\n" "\n" "efidebug devices\n"

• " - show uefi devices\n";

• " - show uefi devices\n"
• "efidebug drivers\n"
• " - show uefi drivers\n";

#endif

U_BOOT_CMD(