diff options
| author | Kim B. Heino <Kim.Heino@bluegiga.com> | 2008-02-29 12:26:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 12:26:21 -0800 |
| commit | 401023710d73aaef1191ab4d6a79d39c51add828 (patch) | |
| tree | a19260d86b6fa1cdb27a368a3d77335cdfb27dbf | |
| parent | 459eea74104ad85c30e17541c2b30d776445e985 (diff) | |
| download | blackbird-op-linux-401023710d73aaef1191ab4d6a79d39c51add828.tar.gz blackbird-op-linux-401023710d73aaef1191ab4d6a79d39c51add828.zip | |
[TUN]: Fix RTNL-locking in tun/tap driver
Current tun/tap driver sets also net device's hw address when asked to
change character device's hw address. This is a good idea, but it
misses RTLN-locking, resulting following error message in 2.6.25-rc3's
inetdev_event() function:
RTNL: assertion failed at net/ipv4/devinet.c (1050)
Attached patch fixes this problem.
Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tun.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 038c1ef94d2e..7b816a032957 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -663,7 +663,11 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, case SIOCSIFHWADDR: { /* try to set the actual net device's hw address */ - int ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); + int ret; + + rtnl_lock(); + ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); + rtnl_unlock(); if (ret == 0) { /** Set the character device's hardware address. This is used when |
