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

fsi/core: Fix error paths on CFAM init 

Change d1dcd67825 re-worked the struct fsi_slave initialisation in
fsi_slave_init, but introduced a few inconsitencies: the slave->dev is
now registered through cdev_device_add, but we may kfree() the device
out from underneath the cdev registration. We may also leave an IDA
allocated.

This change fixes the error paths, so that we kfree() only before the
device is registered with the core code. We also move the smode write to
before we start creating proper devices, as it's the most likely to
fail. We also remove the IDA-allocated minor on error, and properly
clean up the of_node.

Fixes: d1dcd67825 ("fsi: Add cfam char devices")
Reported-by: Lei YU <mine260309@gmail.com>
Tested-by: John Wang <wangzqbj@inspur.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Jeremy Kerr 2019-06-28 16:07:37 +08:00 committed by Joel Stanley
parent afd26118f0
commit 371975b0b0
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/fsi/fsi-core.c
View File

@ -1037,6 +1037,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
} }
rc = fsi_slave_set_smode(slave);
if (rc) {
dev_warn(&master->dev,
"can't set smode on slave:%02x:%02x %d\n",
link, id, rc);
goto err_free;
}
/* Allocate a minor in the FSI space */ /* Allocate a minor in the FSI space */
rc = __fsi_get_new_minor(slave, fsi_dev_cfam, &slave->dev.devt, rc = __fsi_get_new_minor(slave, fsi_dev_cfam, &slave->dev.devt,
&slave->cdev_idx); &slave->cdev_idx);
@ -1048,17 +1056,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
rc = cdev_device_add(&slave->cdev, &slave->dev); rc = cdev_device_add(&slave->cdev, &slave->dev);
if (rc) { if (rc) {
dev_err(&slave->dev, "Error %d creating slave device\n", rc); dev_err(&slave->dev, "Error %d creating slave device\n", rc);
goto err_free; goto err_free_ida;
} }
rc = fsi_slave_set_smode(slave); /* Now that we have the cdev registered with the core, any fatal
if (rc) { * failures beyond this point will need to clean up through
dev_warn(&master->dev, * cdev_device_del(). Fortunately though, nothing past here is fatal.
"can't set smode on slave:%02x:%02x %d\n", */
link, id, rc);
kfree(slave);
return -ENODEV;
}
if (master->link_config) if (master->link_config)
master->link_config(master, link, master->link_config(master, link,
slave->t_send_delay, slave->t_send_delay,
@ -1075,10 +1080,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
dev_dbg(&master->dev, "failed during slave scan with: %d\n", dev_dbg(&master->dev, "failed during slave scan with: %d\n",
rc); rc);
return rc; return 0;
err_free: err_free_ida:
put_device(&slave->dev); fsi_free_minor(slave->dev.devt);
err_free:
of_node_put(slave->dev.of_node);
kfree(slave);
return rc; return rc;
} }