forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udldrmfb: udl_get_edid: usb_control_msg buffer must not be on the stack

Browse source 
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>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Hans de Goede 2013-01-11 12:08:57 +01:00 • committed by Dave Airlie
parent c930812fe5
commit 242187b362
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/udl/udl_connector.c
View file

@ -22,13 +22,17 @@
static u8 *udl_get_edid(struct udl_device *udl) static u8 *udl_get_edid(struct udl_device *udl)
{ {
u8 *block; u8 *block;
char rbuf[3]; char *rbuf;
int ret, i; int ret, i;
block = kmalloc(EDID_LENGTH, GFP_KERNEL); block = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (block == NULL) if (block == NULL)
return NULL; return NULL;
rbuf = kmalloc(2, GFP_KERNEL);
if (rbuf == NULL)
goto error;
for (i = 0; i < EDID_LENGTH; i++) { for (i = 0; i < EDID_LENGTH; i++) {
ret = usb_control_msg(udl->ddev->usbdev, ret = usb_control_msg(udl->ddev->usbdev,
usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02), usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02),
@ -42,10 +46,12 @@ static u8 *udl_get_edid(struct udl_device *udl)
block[i] = rbuf[1]; block[i] = rbuf[1];
} }
kfree(rbuf);
return block; return block;
error: error:
kfree(block); kfree(block);
kfree(rbuf);
return NULL; return NULL;
} }