xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xtensa: iss: fix handling error cases in iss_net_configure()

Browse Source 
[ Upstream commit 628ccfc8f5f79dd548319408fcc53949fe97b258 ]

The 'pdev' and 'netdev' need to be released in error cases of
iss_net_configure().

Change the return type of iss_net_configure() to void, because it's
not used.

Fixes: 7282bee787 ("[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 8")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2022-07-07 10:32:29 +08:00
committed by Greg Kroah-Hartman
parent fb4c1555f9
commit d6d344eeef
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/xtensa/platforms/iss/network.c
View File

@@ -511,16 +511,15 @@ static void iss_net_pdev_release(struct device *dev)
free_netdev(lp->dev); free_netdev(lp->dev);
} }
static int iss_net_configure(int index, char *init) static void iss_net_configure(int index, char *init)
{ {
struct net_device *dev; struct net_device *dev;
struct iss_net_private *lp; struct iss_net_private *lp;
int err;
dev = alloc_etherdev(sizeof(*lp)); dev = alloc_etherdev(sizeof(*lp));
if (dev == NULL) { if (dev == NULL) {
pr_err("eth_configure: failed to allocate device\n"); pr_err("eth_configure: failed to allocate device\n");
return 1; return;
} }
/* Initialize private element. */ /* Initialize private element. */
@@ -549,7 +548,7 @@ static int iss_net_configure(int index, char *init)
if (!tuntap_probe(lp, index, init)) { if (!tuntap_probe(lp, index, init)) {
pr_err("%s: invalid arguments. Skipping device!\n", pr_err("%s: invalid arguments. Skipping device!\n",
dev->name); dev->name);
goto errout; goto err_free_netdev;
} }
pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr); pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr);
@@ -557,7 +556,8 @@ static int iss_net_configure(int index, char *init)
/* sysfs register */ /* sysfs register */
if (!driver_registered) { if (!driver_registered) {
platform_driver_register(&iss_net_driver); if (platform_driver_register(&iss_net_driver))
goto err_free_netdev;
driver_registered = 1; driver_registered = 1;
} }
@@ -568,7 +568,8 @@ static int iss_net_configure(int index, char *init)
lp->pdev.id = index; lp->pdev.id = index;
lp->pdev.name = DRIVER_NAME; lp->pdev.name = DRIVER_NAME;
lp->pdev.dev.release = iss_net_pdev_release; lp->pdev.dev.release = iss_net_pdev_release;
platform_device_register(&lp->pdev); if (platform_device_register(&lp->pdev))
goto err_free_netdev;
SET_NETDEV_DEV(dev, &lp->pdev.dev); SET_NETDEV_DEV(dev, &lp->pdev.dev);
dev->netdev_ops = &iss_netdev_ops; dev->netdev_ops = &iss_netdev_ops;
@@ -577,23 +578,20 @@ static int iss_net_configure(int index, char *init)
dev->irq = -1; dev->irq = -1;
rtnl_lock(); rtnl_lock();
err = register_netdevice(dev); if (register_netdevice(dev)) {
rtnl_unlock(); rtnl_unlock();
if (err) {
pr_err("%s: error registering net device!\n", dev->name); pr_err("%s: error registering net device!\n", dev->name);
/* XXX: should we call ->remove() here? */ platform_device_unregister(&lp->pdev);
free_netdev(dev); return;
return 1;
} }
rtnl_unlock();
timer_setup(&lp->tl, iss_net_user_timer_expire, 0); timer_setup(&lp->tl, iss_net_user_timer_expire, 0);
return 0; return;
errout: err_free_netdev:
/* FIXME: unregister; free, etc.. */ free_netdev(dev);
return -EIO;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */