Commit 9d86a569 authored by Ben Hutchings's avatar Ben Hutchings Committed by Sasha Levin

catc: Use heap buffer for memory size test

[ Upstream commit 2d6a0e9d ]

Allocating USB buffers on the stack is not portable, and no longer
works on x86_64 (with VMAP_STACK enabled as per default).

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 4d7726af
...@@ -777,7 +777,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -777,7 +777,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
struct net_device *netdev; struct net_device *netdev;
struct catc *catc; struct catc *catc;
u8 broadcast[ETH_ALEN]; u8 broadcast[ETH_ALEN];
int i, pktsz, ret; int pktsz, ret;
if (usb_set_interface(usbdev, if (usb_set_interface(usbdev,
intf->altsetting->desc.bInterfaceNumber, 1)) { intf->altsetting->desc.bInterfaceNumber, 1)) {
...@@ -841,15 +841,24 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -841,15 +841,24 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
catc->irq_buf, 2, catc_irq_done, catc, 1); catc->irq_buf, 2, catc_irq_done, catc, 1);
if (!catc->is_f5u011) { if (!catc->is_f5u011) {
u32 *buf;
int i;
dev_dbg(dev, "Checking memory size\n"); dev_dbg(dev, "Checking memory size\n");
i = 0x12345678; buf = kmalloc(4, GFP_KERNEL);
catc_write_mem(catc, 0x7a80, &i, 4); if (!buf) {
i = 0x87654321; ret = -ENOMEM;
catc_write_mem(catc, 0xfa80, &i, 4); goto fail_free;
catc_read_mem(catc, 0x7a80, &i, 4); }
*buf = 0x12345678;
catc_write_mem(catc, 0x7a80, buf, 4);
*buf = 0x87654321;
catc_write_mem(catc, 0xfa80, buf, 4);
catc_read_mem(catc, 0x7a80, buf, 4);
switch (i) { switch (*buf) {
case 0x12345678: case 0x12345678:
catc_set_reg(catc, TxBufCount, 8); catc_set_reg(catc, TxBufCount, 8);
catc_set_reg(catc, RxBufCount, 32); catc_set_reg(catc, RxBufCount, 32);
...@@ -865,6 +874,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -865,6 +874,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
break; break;
} }
kfree(buf);
dev_dbg(dev, "Getting MAC from SEEROM.\n"); dev_dbg(dev, "Getting MAC from SEEROM.\n");
catc_get_mac(catc, netdev->dev_addr); catc_get_mac(catc, netdev->dev_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment