1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index d8b1ba15aa6f..0ce07a339c7e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -741,7 +741,12 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         case SIOCADDMULTI:
                 /** Add the specified group to the character device's multicast filter
                  * list. */
+                rtnl_lock();
+                netif_tx_lock_bh(tun->dev);
                 add_multi(tun->chr_filter, ifr.ifr_hwaddr.sa_data);
+                netif_tx_unlock_bh(tun->dev);
+                rtnl_unlock();
+
                 DBG(KERN_DEBUG "%s: add multi: %s\n",
                     tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
                 return 0;
@@ -749,7 +754,12 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         case SIOCDELMULTI:
                 /** Remove the specified group from the character device's multicast
                  * filter list. */
+                rtnl_lock();
+                netif_tx_lock_bh(tun->dev);
                 del_multi(tun->chr_filter, ifr.ifr_hwaddr.sa_data);
+                netif_tx_unlock_bh(tun->dev);
+                rtnl_unlock();
+
                 DBG(KERN_DEBUG "%s: del multi: %s\n",
                     tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
                 return 0;