rose_dev: fix memcpy-bug in rose_set_mac_address
Subsystems (2)
Quoted 6 lines · David Miller
Quoted 6 lines
This patch fixes a small bug in
rose_set_mac_address. If the current and new MAC addresses match, then nothing needs to be done. However memcpy was used instead of memcmp for comparison.The patch is against the latest net-tree.
Quoted 7 lines
Quoted 1 line
Signed-off-by Daniel Borkmann <[email protected]>You're breaking this code, not fixing it.
If you don't keep the memcpy, then the calls right below which setup the loopback node will use the previous device address not the new one being configured.
David, thanks for your feedback! So here's a small rework of the patch:
If both addresses equal, nothing needs to be done. If the device is down, then we simply copy the new address to dev->dev_addr. If the device is up, then we add another loopback device with the new address, and if that does not fail, we remove the loopback device with the old address. And only then, we update the dev->dev_addr.
--- net/rose/rose_dev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/rose/rose_dev.c +2 -2
@@ -96,11 +96,11 @@ static int rose_set_mac_address(struct net_device *dev, void *addr)struct sockaddr *sa = addr;int err; -if (!memcpy (dev->dev_addr, sa->sa_data, dev->addr_len)) +if (!memcmp (dev->dev_addr, sa->sa_data, dev->addr_len))return 0 ;if (dev->flags &IFF_UP ) { - err =rose_add_loopback_node ((rose_address *)dev->dev_addr); + err =rose_add_loopback_node ((rose_address *)sa->sa_data);if (err)return err;
David Miller
maintainerFrom: Daniel Borkmann <[email protected]>
Date: Wed, 28 Mar 2012 10:47:43 +0200
Quoted 7 lines
If both addresses equal, nothing needs to be done. If the device is down, then we simply copy the new address to
dev->dev_addr. If the device is up, then we add another loopback device with the new address, and if that does not fail, we remove the loopback device with the old address. And only then, we update thedev->dev_addr.Signed-off-by Daniel Borkmann <[email protected]>
Applied and queued up for -stable.