mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
davinci_emac: fix kernel oops when changing MAC address while interface is down
Check that network interface is running before changing its MAC address. Otherwise, rxch is accessed when it's NULL - causing a kernel oops. Moreover, check that the new MAC address is valid. Signed-off-by: Pablo Bitton <pablo.bitton@gmail.com> Signed-off-by: Chaithrika U S <chaithrika@ti.com> Tested-by: Chaithrika U S <chaithrika@ti.com> [tested on DM6467 EVM] Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
19e588e7d1
commit
64c8165b44
1 changed files with 10 additions and 2 deletions
|
@ -1820,11 +1820,19 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr)
|
|||
struct device *emac_dev = &priv->ndev->dev;
|
||||
struct sockaddr *sa = addr;
|
||||
|
||||
if (!is_valid_ether_addr(sa->sa_data))
|
||||
return -EINVAL;
|
||||
|
||||
/* Store mac addr in priv and rx channel and set it in EMAC hw */
|
||||
memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len);
|
||||
memcpy(rxch->mac_addr, sa->sa_data, ndev->addr_len);
|
||||
memcpy(ndev->dev_addr, sa->sa_data, ndev->addr_len);
|
||||
emac_setmac(priv, EMAC_DEF_RX_CH, rxch->mac_addr);
|
||||
|
||||
/* If the interface is down - rxch is NULL. */
|
||||
/* MAC address is configured only after the interface is enabled. */
|
||||
if (netif_running(ndev)) {
|
||||
memcpy(rxch->mac_addr, sa->sa_data, ndev->addr_len);
|
||||
emac_setmac(priv, EMAC_DEF_RX_CH, rxch->mac_addr);
|
||||
}
|
||||
|
||||
if (netif_msg_drv(priv))
|
||||
dev_notice(emac_dev, "DaVinci EMAC: emac_dev_setmac_addr %pM\n",
|
||||
|
|
Loading…
Reference in a new issue