fsi/core: Fix error paths on CFAM init
PATCH 1/1 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.
---
Lei: Can you test this on your hardware? Thanks!
--- drivers/fsi/fsi-core.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/fsi/fsi-core.c +21 -13
@@ -1029,6 +1029,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 */ rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);
@@ -1040,17 +1048,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (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); -if (rc) { -dev_warn (&master->dev, -"can't set smode on slave:%02x:%02x %d\n" , - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal +* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal. +*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,
@@ -1067,11 +1072,14 @@ 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" , rc); -return rc; +return 0 ; - err_free: -put_device (&slave->dev); -return rc; +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave); + return rc }/* FSI master support */
Signature · 1 line
2.20.1
Quoted 73 lines · Jeremy Kerr
Change
d1dcd67825re-worked the structfsi_slaveinitialisation infsi_slave_init, but introduced a few inconsitencies: theslave->devis now registered throughcdev_device_add, but we maykfree()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 theof_node.Fixes d1dcd678257603e71cf3f3d84c70e2b6f0f14bb8Reported-by Lei YU <[email protected]>Signed-off-by Jeremy Kerr <[email protected]>---
Lei: Can you test this on your hardware? Thanks!
--- drivers/fsi/fsi-core.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)drivers/fsi/fsi-core.c +15
-10@@ -1029,6 +1029,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 */ rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);@@ -1040,17 +1048,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (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); -if (rc) { -dev_warn (&master->dev, -"can't set smode on slave:%02x:%02x %d\n" , - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal +* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal. +*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,@@ -1067,11 +1072,14 @@ 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" , rc); -return rc; +return 0 ;
drivers/fsi/fsi-core.c static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) · line 1082
Quoted 10 lines
drivers/fsi/fsi-core.c +6
-3- err_free: -put_device (&slave->dev); -return rc; +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave); +return rc
semicolon missed :)
Quoted 6 lines
drivers/fsi/fsi-core.c +0
-1}/* FSI master support */ --2.20.1
Hi John,
Quoted 2 lines
Quoted 1 line
+ return rc
semicolon missed :)
Whoa, I must have removed that after the last test. v2 coming.
Cheers,
Hereny
PATCH v2 1/1 fsi/core: Fix error paths on CFAM init
In reply to Jeremy KerrChange 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.
---
v2:
fix dropped semicolon
--- drivers/fsi/fsi-core.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/fsi/fsi-core.c +20 -12
@@ -1029,6 +1029,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 */ rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);
@@ -1040,17 +1048,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (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); -if (rc) { -dev_warn (&master->dev, -"can't set smode on slave:%02x:%02x %d\n" , - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal +* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal. +*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,
@@ -1067,10 +1072,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" , rc); -return rc; +return 0 ; - err_free: -put_device (&slave->dev); +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave);return rc; }
Signature · 1 line
2.20.1
Quoted 86 lines · Jeremy Kerr
Change
d1dcd67825re-worked the structfsi_slaveinitialisation infsi_slave_init, but introduced a few inconsitencies: theslave->devis now registered throughcdev_device_add, but we maykfree()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 theof_node.Fixes d1dcd678257603e71cf3f3d84c70e2b6f0f14bb8Reported-by Lei YU <[email protected]>Signed-off-by Jeremy Kerr <[email protected]>---
v2:
fix dropped semicolon--- drivers/fsi/fsi-core.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)drivers/fsi/fsi-core.c +20
-13@@ -1029,6 +1029,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 */ rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);@@ -1040,17 +1048,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (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); -if (rc) { -dev_warn (&master->dev, -"can't set smode on slave:%02x:%02x %d\n" , - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal +* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal. +*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,@@ -1067,10 +1072,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" , rc); -return rc; +return 0 ; - err_free: -put_device (&slave->dev); +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave);return rc; } --2.20.1
Quoted 14 lines · Jeremy Kerr
Change
d1dcd67825re-worked the structfsi_slaveinitialisation infsi_slave_init, but introduced a few inconsitencies: theslave->devis
now registered throughcdev_device_add, but we maykfree()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 theof_node.
Quoted 4 lines
Fixes d1dcd678257603e71cf3f3d84c70e2b6f0f14bb8Reported-by Lei YU <[email protected]>Signed-off-by Jeremy Kerr <[email protected]>---
You want to take maintainership of drivers/fsi ? :-)
Quoted 78 lines
Lei: Can you test this on your hardware? Thanks!
--- drivers/fsi/fsi-core.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)drivers/fsi/fsi-core.c +8
-0@@ -1029,6 +1029,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 */ drivers/fsi/fsi-core.c +2
-9rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);@@ -1040,17 +1048,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (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); -if (rc) { -dev_warn (&master->dev, - "can't set smode on slave:%02x:%02x %d\n", - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal
drivers/fsi/fsi-core.c +2
-0+* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal.
drivers/fsi/fsi-core.c +9
-4+*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,@@ -1067,11 +1072,14 @@ 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", rc); -return rc; +return 0 ; - err_free: -put_device (&slave->dev); -return rc; +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave); + return rc }/* FSI master support */