summary refs log tree commit diff
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorMartin Schiller <ms@dev.tdt.de>2020-11-18 07:39:19 +0100
committerJakub Kicinski <kuba@kernel.org>2020-11-23 10:32:39 -0800
commit8e1e33ffa696b2d779dd5cd422a80960b88e508c (patch)
tree1f6c71e3730d0c1837d3d7651693f9ed6382dad9 /drivers/net/tun.c
parentf9e425e99b0756c1479042afe761073779df2a30 (diff)
downloadlinux-8e1e33ffa696b2d779dd5cd422a80960b88e508c.tar.gz
net/tun: Call type change netdev notifiers
Call netdev notifiers before and after changing the device type.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Link: https://lore.kernel.org/r/20201118063919.29485-1-ms@dev.tdt.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 3d45d56172cb..7c62d82c57db 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -3071,10 +3071,19 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 				   "Linktype set failed because interface is up\n");
 			ret = -EBUSY;
 		} else {
+			ret = call_netdevice_notifiers(NETDEV_PRE_TYPE_CHANGE,
+						       tun->dev);
+			ret = notifier_to_errno(ret);
+			if (ret) {
+				netif_info(tun, drv, tun->dev,
+					   "Refused to change device type\n");
+				break;
+			}
 			tun->dev->type = (int) arg;
 			netif_info(tun, drv, tun->dev, "linktype set to %d\n",
 				   tun->dev->type);
-			ret = 0;
+			call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE,
+						 tun->dev);
 		}
 		break;