Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970390fd authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

catc: Use heap buffer for memory size test 



[ Upstream commit 2d6a0e9de03ee658a9adc3bfb2f0ca55dff1e478 ]

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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61bf9f38

drivers/net/usb/catc.c

+18 −7
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id 
	struct net_device *netdev;

	struct catc *catc;

	u8 broadcast[ETH_ALEN];

	int i, pktsz, ret;

	int pktsz, ret;



	if (usb_set_interface(usbdev,

			intf->altsetting->desc.bInterfaceNumber, 1)) {
@@ -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);



	if (!catc->is_f5u011) {

		u32 *buf;

		int i;



		dev_dbg(dev, "Checking memory size\n");



		i = 0x12345678;

		catc_write_mem(catc, 0x7a80, &i, 4);

		i = 0x87654321;	

		catc_write_mem(catc, 0xfa80, &i, 4);

		catc_read_mem(catc, 0x7a80, &i, 4);

		buf = kmalloc(4, GFP_KERNEL);

		if (!buf) {

			ret = -ENOMEM;

			goto fail_free;

		}



		*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:

			catc_set_reg(catc, TxBufCount, 8);

			catc_set_reg(catc, RxBufCount, 32);
@@ -865,6 +874,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id 
			break;

		}



		kfree(buf);

	  

		dev_dbg(dev, "Getting MAC from SEEROM.\n");

	  

		catc_get_mac(catc, netdev->dev_addr);