Attachment 676816 Details for Bug 894299 – PATCH: udldrmfb: udl_get_edid: usb_control_msg buffer must not be on the stack

[patch] PATCH: udldrmfb: udl_get_edid: usb_control_msg buffer must not be on the stack

0002-udldrmfb-udl_get_edid-usb_control_msg-buffer-must-no.patch (text/plain), 1.37 KB, created by Hans de Goede on 2013-01-11 11:16:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2013-01-11 11:16:15 UTC

Size: 1.37 KB

patch

obsolete

>From a7e8a94e6a3c9e494c9bc84784cc99f192564384 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Fri, 11 Jan 2013 11:55:24 +0100
>Subject: [PATCH 2/3] udldrmfb: udl_get_edid: usb_control_msg buffer must not
> be on the stack
>
>The buffer passed to usb_control_msg may end up in scatter-gather list, and
>may thus not be on the stack. Having it on the stack usually works on x86, but
>not on other archs.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>---
> drivers/gpu/drm/udl/udl_connector.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
>index 86538c9..a8c76f4 100644
>--- a/drivers/gpu/drm/udl/udl_connector.c
>+++ b/drivers/gpu/drm/udl/udl_connector.c
>@@ -22,13 +22,17 @@
> static u8 *udl_get_edid(struct udl_device *udl)
> {
> 	u8 *block;
>-	char rbuf[3];
>+	char *rbuf;
> 	int ret, i;
> 
> 	block = kmalloc(EDID_LENGTH, GFP_KERNEL);
> 	if (block == NULL)
> 		return NULL;
> 
>+	rbuf = kmalloc(2, GFP_KERNEL);
>+	if (rbuf == NULL)
>+		goto error;
>+
> 	for (i = 0; i < EDID_LENGTH; i++) {
> 		ret = usb_control_msg(udl->ddev->usbdev,
> 				      usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02),
>@@ -42,10 +46,12 @@ static u8 *udl_get_edid(struct udl_device *udl)
> 		block[i] = rbuf[1];
> 	}
> 
>+	kfree(rbuf);
> 	return block;
> 
> error:
> 	kfree(block);
>+	kfree(rbuf);
> 	return NULL;
> }
> 
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 894299: 676816