From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cmjYx-0008CK-93 for barebox@lists.infradead.org; Sat, 11 Mar 2017 16:08:14 +0000 From: Michael Olbrich Date: Sat, 11 Mar 2017 17:07:32 +0100 Message-Id: <20170311160733.18473-1-m.olbrich@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/2] efi: load the protocol expected by the driver To: barebox@lists.infradead.org Cc: Michael Olbrich 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 --- drivers/efi/efi-device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox