UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bareudp: add missing error handling for bareudp_link_config() 

.dellink does not get called after .newlink fails,
bareudp_newlink() must undo what bareudp_configure()
has done if bareudp_link_config() fails.

v2: call bareudp_dellink(), like bareudp_dev_create() does

Fixes: 571912c69f ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.")
Link: https://lore.kernel.org/r/20210105190725.1736246-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2021-01-05 11:07:25 -08:00
parent 0d136f5cd9
commit 94bcfdbff0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/bareudp.c
View File

@ -645,11 +645,20 @@ static int bareudp_link_config(struct net_device *dev,
return 0; return 0;
} }
static void bareudp_dellink(struct net_device *dev, struct list_head *head)
{
struct bareudp_dev *bareudp = netdev_priv(dev);
list_del(&bareudp->next);
unregister_netdevice_queue(dev, head);
}
static int bareudp_newlink(struct net *net, struct net_device *dev, static int bareudp_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[], struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct bareudp_conf conf; struct bareudp_conf conf;
LIST_HEAD(list_kill);
int err; int err;
err = bareudp2info(data, &conf, extack); err = bareudp2info(data, &conf, extack);
@ -662,17 +671,14 @@ static int bareudp_newlink(struct net *net, struct net_device *dev,
err = bareudp_link_config(dev, tb); err = bareudp_link_config(dev, tb);
if (err) if (err)
return err; goto err_unconfig;
return 0; return 0;
}
static void bareudp_dellink(struct net_device *dev, struct list_head *head) err_unconfig:
{ bareudp_dellink(dev, &list_kill);
struct bareudp_dev *bareudp = netdev_priv(dev); unregister_netdevice_many(&list_kill);
return err;
list_del(&bareudp->next);
unregister_netdevice_queue(dev, head);
} }
static size_t bareudp_get_size(const struct net_device *dev) static size_t bareudp_get_size(const struct net_device *dev)