Skip to contentSkip to conversation

staging: comedi: drivers: usbduxfast.c: fix for DMA buffers on stack

PATCH In review Kumar Amit Mehta 4 participants 6 messages Feb 22, 2013 – Feb 23, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging: comedi: drivers: usbduxfast.c: fix for DMA buffers on stack

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUXfast Board driver.

---
 drivers/staging/comedi/drivers/usbduxfast.c |   30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +18 -12
index 4bf5dd0..1ba0e3d 100644
@@ -436,10 +436,14 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
 static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to zero */
-	local_transfer_buffer[0] = 0;
+	*local_transfer_buffer = 0;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -450,22 +454,25 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 			      local_transfer_buffer,
 			      1,      /* Length */
 			      EZTIMEOUT);    /* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (start)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to one */
-	local_transfer_buffer[0] = 1;
+	*local_transfer_buffer = 1;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -474,13 +481,12 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 			      0x0000,	/* Index */
 			      local_transfer_buffer, 1,	/* Length */
 			      EZTIMEOUT);	/* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (stop)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
Signature · 1 line
1.7.9.5
#1 lore raw

Am 22.02.2013 19:07, schrieb Kumar Amit Mehta:

Quoted 68 lines

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUXfast Board driver.

---
 drivers/staging/comedi/drivers/usbduxfast.c |   30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +16 -9
index 4bf5dd0..1ba0e3d 100644
@@ -436,10 +436,14 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
 static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to zero */
-	local_transfer_buffer[0] = 0;
+	*local_transfer_buffer = 0;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -450,22 +454,25 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 			      local_transfer_buffer,
 			      1,      /* Length */
 			      EZTIMEOUT);    /* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (start)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to one */
-	local_transfer_buffer[0] = 1;
+	*local_transfer_buffer = 1;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -474,13 +481,12 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 			      0x0000,	/* Index */
 			      local_transfer_buffer, 1,	/* Length */
 			      EZTIMEOUT);	/* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,

drivers/staging/comedi/drivers/usbduxfast.c static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs) · line 492

Quoted 10 lines
drivers/staging/comedi/drivers/usbduxfast.c +2 -3
 			"control msg failed (stop)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,

mmh, it seems a bit overheat to alloc 1 byte. Could one of the driver maintainers please comment is that realy need ? or is it possible to pass one byte in a register ? (aka char/int) without allocating ?

re,
wh

maintainer
#2 lore raw
Quoted 80 lines · walter harms

Am 22.02.2013 19:07, schrieb Kumar Amit Mehta:

Quoted 77 lines

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUXfast Board driver.

---
 drivers/staging/comedi/drivers/usbduxfast.c |   30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +18 -12
index 4bf5dd0..1ba0e3d 100644
@@ -436,10 +436,14 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
 static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to zero */
-	local_transfer_buffer[0] = 0;
+	*local_transfer_buffer = 0;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -450,22 +454,25 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 			      local_transfer_buffer,
 			      1,      /* Length */
 			      EZTIMEOUT);    /* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (start)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to one */
-	local_transfer_buffer[0] = 1;
+	*local_transfer_buffer = 1;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -474,13 +481,12 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 			      0x0000,	/* Index */
 			      local_transfer_buffer, 1,	/* Length */
 			      EZTIMEOUT);	/* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (stop)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
Quoted 5 lines

drivers/staging/comedi/drivers/usbduxfast.c static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs) · line 492

Quoted 1 line
drivers/staging/comedi/drivers/usbduxfast.c +0 -0
 static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,

mmh, it seems a bit overheat to alloc 1 byte. Could one of the driver maintainers please comment is that realy need ?

Yes it is needed.

Quoted 2 lines

or is it possible to pass one byte
in a register ? (aka char/int) without allocating ?

Nope, the USB host controllers must be able to DMA to this memory location, so you have to allocate it dynamically, sorry.

thanks,

greg k-h

#3 lore raw

Am 22.02.2013 20:06, schrieb Greg KH:

Quoted 89 lines · walter harms
Quoted 80 lines

Am 22.02.2013 19:07, schrieb Kumar Amit Mehta:

Quoted 77 lines

fix for instances of DMA buffer on stack(being passed to usb_control_msg) for the USB-DUXfast Board driver.

---
 drivers/staging/comedi/drivers/usbduxfast.c |   30 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/staging/comedi/drivers/usbduxfast.c +18 -12
index 4bf5dd0..1ba0e3d 100644
@@ -436,10 +436,14 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
 static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to zero */
-	local_transfer_buffer[0] = 0;
+	*local_transfer_buffer = 0;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -450,22 +454,25 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
 			      local_transfer_buffer,
 			      1,      /* Length */
 			      EZTIMEOUT);    /* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (start)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
 static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 {
 	int ret;
-	unsigned char local_transfer_buffer[16];
+	unsigned char *local_transfer_buffer;
+
+	local_transfer_buffer = kmalloc(1, GFP_KERNEL);
+	if (!local_transfer_buffer)
+		return -ENOMEM;
 
 	/* 7f92 to one */
-	local_transfer_buffer[0] = 1;
+	*local_transfer_buffer = 1;
 	/* bRequest, "Firmware" */
 	ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
 			      USBDUXFASTSUB_FIRMWARE,
@@ -474,13 +481,12 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
 			      0x0000,	/* Index */
 			      local_transfer_buffer, 1,	/* Length */
 			      EZTIMEOUT);	/* Timeout */
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&udfs->interface->dev,
 			"control msg failed (stop)\n");
-		return ret;
-	}
 
-	return 0;
+	kfree(local_transfer_buffer);
+	return ret;
 }
 
Quoted 5 lines

drivers/staging/comedi/drivers/usbduxfast.c static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs) · line 492

Quoted 1 line
drivers/staging/comedi/drivers/usbduxfast.c +0 -0
 static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,

mmh, it seems a bit overheat to alloc 1 byte. Could one of the driver maintainers please comment is that realy need ?

Yes it is needed.

Quoted 7 lines
Quoted 2 lines

or is it possible to pass one byte
in a register ? (aka char/int) without allocating ?

Nope, the USB host controllers must be able to DMA to this memory location, so you have to allocate it dynamically, sorry.

thanks,

thx for clarification.

@Kumar Amit Mehta:
Would you mind to add this as comment ? Allocating one byte does not look clever so maybe will come up with the idea of changing that.

re,
wh

#4 lore raw
Quoted 6 lines · walter harms
Quoted 6 lines
Quoted 2 lines

or is it possible to pass one byte
in a register ? (aka char/int) without allocating ?

Nope, the USB host controllers must be able to DMA to this memory location, so you have to allocate it dynamically, sorry.

Quoted 8 lines
Quoted 1 line

thanks,

thx for clarification.

@Kumar Amit Mehta:
Would you mind to add this as comment ? Allocating one byte does not look clever so maybe will come up with the idea of changing that.

That can't happen. The reason is already recorded in the git history. Greg and Ian know that DMA to stack memory doesn't work. Most maintainers know about that. If someone changed it back then Fengguang would send an automatic email about it as soon as it was committed to a public git tree.

regards,
dan carpenter

#5 lore raw

Am 23.02.2013 18:34, schrieb Dan Carpenter:

Quoted 16 lines · walter harms
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

or is it possible to pass one byte
in a register ? (aka char/int) without allocating ?

Nope, the USB host controllers must be able to DMA to this memory location, so you have to allocate it dynamically, sorry.

Quoted 8 lines
Quoted 1 line

thanks,

thx for clarification.

@Kumar Amit Mehta:
Would you mind to add this as comment ? Allocating one byte does not look clever so maybe will come up with the idea of changing that.

Quoted 6 lines

That can't happen. The reason is already recorded in the git history. Greg and Ian know that DMA to stack memory doesn't work. Most maintainers know about that. If someone changed it back then Fengguang would send an automatic email about it as soon as it was committed to a public git tree.

I am not sure about that we talk about the same thing, i am thinking about the "casual "reader" discovering a one-byte-malloc.
He will not check the githistory, he will thing "WTF there are doing here ?"

I will not make things more complicated, IMHO an malloc of one byte is a strange thing and strange things should be commented in code. If the maintainer says "no" i will survive.

re,
wh