]> www.infradead.org Git - users/jedix/linux-maple.git/commit
tun: call dev_get_valid_name() before register_netdevice()
authorCong Wang <xiyou.wangcong@gmail.com>
Fri, 13 Oct 2017 18:58:53 +0000 (11:58 -0700)
committerBrian Maly <brian.maly@oracle.com>
Tue, 25 Jun 2019 17:58:16 +0000 (13:58 -0400)
commitaa134544bac9fc2139ff6dbf640fe2783ecdc8ec
tree556ddf59f229c5b974c2ef4d84f11bd5aad913ff
parenta3a1a6ec86b522594a8d62929fb3f17eda8ac74d
tun: call dev_get_valid_name() before register_netdevice()

register_netdevice() could fail early when we have an invalid
dev name, in which case ->ndo_uninit() is not called. For tun
device, this is a problem because a timer etc. are already
initialized and it expects ->ndo_uninit() to clean them up.

We could move these initializations into a ->ndo_init() so
that register_netdevice() knows better, however this is still
complicated due to the logic in tun_detach().

Therefore, I choose to just call dev_get_valid_name() before
register_netdevice(), which is quicker and much easier to audit.
And for this specific case, it is already enough.

Fixes: 96442e42429e ("tuntap: choose the txq based on rxq")
Reported-by: Dmitry Alexeev <avekceeb@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0ad646c81b2182f7fa67ec0c8c825e0ee165696d)

Orabug: 29925555
CVE: CVE-2018-7191

Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/tun.c
include/linux/netdevice.h
net/core/dev.c