[PATCH 1/2] efi: load the protocol expected by the driver

[Sascha Hauer]

On Sat, Mar 11, 2017 at 05:07:32PM +0100, Michael Olbrich wrote:
> The drivers are loaded if any guid provided by the device matches. So load
> the protocol for the matched guid and not for the first guid.
> Otherwise the driver may cast the protocol to the wrong type and proably
> crash.
> 
> Signed-off-by: Michael Olbrich <m.olbrich at pengutronix.de>
> ---
>  drivers/efi/efi-device.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
> index 959878e7f5cf..c5fb404cd36b 100644
> --- a/drivers/efi/efi-device.c
> +++ b/drivers/efi/efi-device.c
> @@ -184,8 +184,6 @@ static struct efi_device *efi_add_device(efi_handle_t *handle, efi_guid_t **guid
>  	efidev->dev.info = efi_devinfo;
>  	efidev->devpath = devpath;
>  
> -	BS->handle_protocol(handle, &guidarr[0], &efidev->protocol);
> -
>  	sprintf(efidev->dev.name, "handle-%p", handle);
>  
>  	efidev->parent_handle = efi_find_parent(efidev->handle);
> @@ -311,8 +309,11 @@ static int efi_bus_match(struct device_d *dev, struct driver_d *drv)
>  	int i;
>  
>  	for (i = 0; i < efidev->num_guids; i++) {
> -		if (!memcmp(&efidrv->guid, &efidev->guids[i], sizeof(efi_guid_t)))
> +		if (!memcmp(&efidrv->guid, &efidev->guids[i], sizeof(efi_guid_t))) {
> +			BS->handle_protocol(efidev->handle, &efidev->guids[i],
> +					&efidev->protocol);
>  			return 0;
> +		}
>  	}
>  
>  	return 1;
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |