net/usb/r8152: make sure the USB buffer is DMA-able

Allocate the required memory before calling usb_control_msg. And the additional memory copy is necessary. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>

net/usb/r8152: make sure the USB buffer is DMA-able
Allocate the required memory before calling usb_control_msg. And the additional memory copy is necessary. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
hayeswang · David S. Miller
1 parent 543ae7f9c4
Showing 1 changed file with 35 additions and 25 deletions Side-by-side Diff
drivers/net/usb/r8152.c
@@ -344,17 +344,41 @@
 static
 int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
 {
-	return usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
+	int ret;
+	void *tmp;
+
+	tmp = kmalloc(size, GFP_KERNEL);
+	if (!tmp)
+		return -ENOMEM;
+
+	ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
 			       RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
-			       value, index, data, size, 500);
+			       value, index, tmp, size, 500);
+
+	memcpy(data, tmp, size);
+	kfree(tmp);
+
+	return ret;
 }
  
 static
 int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
 {
-	return usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
+	int ret;
+	void *tmp;
+
+	tmp = kmalloc(size, GFP_KERNEL);
+	if (!tmp)
+		return -ENOMEM;
+
+	memcpy(tmp, data, size);
+
+	ret = usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
 			       RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE,
-			       value, index, data, size, 500);
+			       value, index, tmp, size, 500);
+
+	kfree(tmp);
+	return ret;
 }
  
 static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
  
  
@@ -685,21 +709,14 @@
 static inline void set_ethernet_addr(struct r8152 *tp)
 {
 	struct net_device *dev = tp->netdev;
-	u8 *node_id;
+	u8 node_id[8] = {0};
  
-	node_id = kmalloc(sizeof(u8) * 8, GFP_KERNEL);
-	if (!node_id) {
-		netif_err(tp, probe, dev, "out of memory");
-		return;
-	}
-
-	if (pla_ocp_read(tp, PLA_IDR, sizeof(u8) * 8, node_id) < 0)
+	if (pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id) < 0)
 		netif_notice(tp, probe, dev, "inet addr fail\n");
 	else {
 		memcpy(dev->dev_addr, node_id, dev->addr_len);
 		memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 	}
-	kfree(node_id);
 }
  
 static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
  
@@ -882,15 +899,10 @@
 static void _rtl8152_set_rx_mode(struct net_device *netdev)
 {
 	struct r8152 *tp = netdev_priv(netdev);
-	u32 tmp, *mc_filter;	/* Multicast hash filter */
+	u32 mc_filter[2];	/* Multicast hash filter */
+	__le32 tmp[2];
 	u32 ocp_data;
  
-	mc_filter = kmalloc(sizeof(u32) * 2, GFP_KERNEL);
-	if (!mc_filter) {
-		netif_err(tp, link, netdev, "out of memory");
-		return;
-	}
-
 	clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
 	netif_stop_queue(netdev);
 	ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
  
  
@@ -918,14 +930,12 @@
 		}
 	}
  
-	tmp = mc_filter[0];
-	mc_filter[0] = __cpu_to_le32(swab32(mc_filter[1]));
-	mc_filter[1] = __cpu_to_le32(swab32(tmp));
+	tmp[0] = __cpu_to_le32(swab32(mc_filter[1]));
+	tmp[1] = __cpu_to_le32(swab32(mc_filter[0]));
  
-	pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(u32) * 2, mc_filter);
+	pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp);
 	ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
 	netif_wake_queue(netdev);
-	kfree(mc_filter);
 }
  
 static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb,
...	...	@@ -344,17 +344,41 @@
344	344	static
345	345	int get_registers(struct r8152 tp, u16 value, u16 index, u16 size, void data)
346	346	{
347		- return usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
	347	+ int ret;
	348	+ void *tmp;
	349	+
	350	+ tmp = kmalloc(size, GFP_KERNEL);
	351	+ if (!tmp)
	352	+ return -ENOMEM;
	353	+
	354	+ ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
348	355	RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
349		- value, index, data, size, 500);
	356	+ value, index, tmp, size, 500);
	357	+
	358	+ memcpy(data, tmp, size);
	359	+ kfree(tmp);
	360	+
	361	+ return ret;
350	362	}
351	363
352	364	static
353	365	int set_registers(struct r8152 tp, u16 value, u16 index, u16 size, void data)
354	366	{
355		- return usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
	367	+ int ret;
	368	+ void *tmp;
	369	+
	370	+ tmp = kmalloc(size, GFP_KERNEL);
	371	+ if (!tmp)
	372	+ return -ENOMEM;
	373	+
	374	+ memcpy(tmp, data, size);
	375	+
	376	+ ret = usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
356	377	RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE,
357		- value, index, data, size, 500);
	378	+ value, index, tmp, size, 500);
	379	+
	380	+ kfree(tmp);
	381	+ return ret;
358	382	}
359	383
360	384	static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
361	385
362	386
...	...	@@ -685,21 +709,14 @@
685	709	static inline void set_ethernet_addr(struct r8152 *tp)
686	710	{
687	711	struct net_device *dev = tp->netdev;
688		- u8 *node_id;
	712	+ u8 node_id[8] = {0};
689	713
690		- node_id = kmalloc(sizeof(u8) * 8, GFP_KERNEL);
691		- if (!node_id) {
692		- netif_err(tp, probe, dev, "out of memory");
693		- return;
694		- }
695		-
696		- if (pla_ocp_read(tp, PLA_IDR, sizeof(u8) * 8, node_id) < 0)
	714	+ if (pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id) < 0)
697	715	netif_notice(tp, probe, dev, "inet addr fail\n");
698	716	else {
699	717	memcpy(dev->dev_addr, node_id, dev->addr_len);
700	718	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
701	719	}
702		- kfree(node_id);
703	720	}
704	721
705	722	static int rtl8152_set_mac_address(struct net_device netdev, void p)
706	723
...	...	@@ -882,15 +899,10 @@
882	899	static void _rtl8152_set_rx_mode(struct net_device *netdev)
883	900	{
884	901	struct r8152 *tp = netdev_priv(netdev);
885		- u32 tmp, mc_filter; / Multicast hash filter */
	902	+ u32 mc_filter[2]; /* Multicast hash filter */
	903	+ __le32 tmp[2];
886	904	u32 ocp_data;
887	905
888		- mc_filter = kmalloc(sizeof(u32) * 2, GFP_KERNEL);
889		- if (!mc_filter) {
890		- netif_err(tp, link, netdev, "out of memory");
891		- return;
892		- }
893		-
894	906	clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
895	907	netif_stop_queue(netdev);
896	908	ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
897	909
898	910
...	...	@@ -918,14 +930,12 @@
918	930	}
919	931	}
920	932
921		- tmp = mc_filter[0];
922		- mc_filter[0] = __cpu_to_le32(swab32(mc_filter[1]));
923		- mc_filter[1] = __cpu_to_le32(swab32(tmp));
	933	+ tmp[0] = __cpu_to_le32(swab32(mc_filter[1]));
	934	+ tmp[1] = __cpu_to_le32(swab32(mc_filter[0]));
924	935
925		- pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(u32) * 2, mc_filter);
	936	+ pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp);
926	937	ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
927	938	netif_wake_queue(netdev);
928		- kfree(mc_filter);
929	939	}
930	940
931	941	static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb,