PATCH: fix bug in drivers/net/cs89x0.c:set_mac_address()

From: Bernardo Innocenti (bernie@develer.com)
Date: Wed May 14 2003 - 20:23:14 EST

Next message: Andrew Morton: "Re: [PATCH] 2.5.68 FUTEX support should be optional"
Previous message: David van Hoose: "[2.5.69-bk9] BUG & 'Unexpected hw_pointer value' messages"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hello Andrew, Jeff and Alan,

the following patch fixes a bug in the CS89xx net device which
would set new MAC address through SIOCSIFHWADDR _only_ when
net_debug is set, which is obviously not what it was meant to do.
The original code bogusly interpreted the addr argument as a buffer
containing the MAC address instead of a struct sockaddr.

Applies as-is to 2.4.20 and with offset to 2.5.69. Please forward
it to Linus and Marcelo. This bug has been found and fixed by
Stefano Fedrigo <aleph@develer.com>.

--- linux-2.4.20.orig/drivers/net/cs89x0.c 2002-08-03 02:39:44.000000000 +0200
+++ linux-2.4.20/drivers/net/cs89x0.c 2003-01-18 19:00:37.000000000 +0100
@@ -1629,16 +1629,21 @@
}

-static int set_mac_address(struct net_device *dev, void *addr)
+static int set_mac_address(struct net_device *dev, void *p)
{
         int i;
+ struct sockaddr *addr = p;
+

         if (netif_running(dev))
                 return -EBUSY;
+
+ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
         if (net_debug) {
                 printk("%s: Setting MAC address to ", dev->name);
- for (i = 0; i < 6; i++)
- printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
+ for (i = 0; i < dev->addr_len; i++)
+ printk(" %2.2x", dev->dev_addr[i]);
                 printk(".\n");
         }
         /* set the Ethernet address */

-- // Bernardo Innocenti - Develer S.r.l., R&D dept. \X/ http://www.develer.com/

Please don't send Word attachments. See: http://www.gnu.org/philosophy/no-word-attachments.html

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

Next message: Andrew Morton: "Re: [PATCH] 2.5.68 FUTEX support should be optional"
Previous message: David van Hoose: "[2.5.69-bk9] BUG & 'Unexpected hw_pointer value' messages"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Thu May 15 2003 - 22:00:54 EST