Skip to contentSkip to conversation

watchdog: pcwd_usb: Use allocated buffer for usb_control_msg

PATCH In review Guenter Roeck 3 participants 3 messages Oct 14, 2013 – Oct 29, 2013 Watchdog device drivers

lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

PATCH 1/1 watchdog: pcwd_usb: Use allocated buffer for usb_control_msg

usb_control_msg() must use a dma-capable buffer.

This fixes the following error reported by smatch:

drivers/watchdog/pcwd_usb.c:257 usb_pcwd_send_command() error: doing dma on the stack (buf)

---
 drivers/watchdog/pcwd_usb.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/watchdog/pcwd_usb.c +7 -1
index 7b14d18..115a0eb 100644
@@ -235,13 +235,17 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
 		unsigned char cmd, unsigned char *msb, unsigned char *lsb)
 {
 	int got_response, count;
-	unsigned char buf[6];
+	unsigned char *buf;
 
 	/* We will not send any commands if the USB PCWD device does
 	 * not exist */
 	if ((!usb_pcwd) || (!usb_pcwd->exists))
 		return -1;
 
+	buf = kmalloc(6, GFP_KERNEL);
+	if (buf == NULL)
+		return 0;
+
 	/* The USB PC Watchdog uses a 6 byte report format.
 	 * The board currently uses only 3 of the six bytes of the report. */
 	buf[0] = cmd;			/* Byte 0 = CMD */
@@ -277,6 +281,8 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
 		*lsb = usb_pcwd->cmd_data_lsb;
 	}
 
+	kfree(buf);
+
 	return got_response;
 }
 
Signature · 1 line
1.7.9.7
#2 lore raw
In reply to Guenter Roeck

Hi Guenter,

Quoted 11 lines

usb_control_msg() must use a dma-capable buffer.

This fixes the following error reported by smatch:

drivers/watchdog/pcwd_usb.c:257 usb_pcwd_send_command() error: doing dma on the stack (buf)

---
 drivers/watchdog/pcwd_usb.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

This patch has been added to linux-watchog-next.

Kind regards,
Wim.