diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2021-05-17 10:47:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-18 00:27:22 +0200 |
| commit | 444d7be9532dcfda8e0385226c862fd7e986f607 (patch) | |
| tree | 61d9d9581696473a934cf6bb16b31c175eddf211 /net/smc | |
| parent | bonding: init notify_work earlier to avoid uninitialized use (diff) | |
| download | linux-444d7be9532dcfda8e0385226c862fd7e986f607.tar.xz linux-444d7be9532dcfda8e0385226c862fd7e986f607.zip | |
net/smc: remove device from smcd_dev_list after failed device_add()
If the device_add() for a smcd_dev fails, there's no cleanup step that
rolls back the earlier list_add(). The device subsequently gets freed,
and we end up with a corrupted list.
Add some error handling that removes the device from the list.
Fixes: c6ba7c9ba43d ("net/smc: add base infrastructure for SMC-D and ISM")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_ism.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c index 9c6e95882553..d24b96ea0eb5 100644 --- a/net/smc/smc_ism.c +++ b/net/smc/smc_ism.c @@ -428,6 +428,8 @@ EXPORT_SYMBOL_GPL(smcd_alloc_dev); int smcd_register_dev(struct smcd_dev *smcd) { + int rc; + mutex_lock(&smcd_dev_list.mutex); if (list_empty(&smcd_dev_list.list)) { u8 *system_eid = NULL; @@ -447,7 +449,14 @@ int smcd_register_dev(struct smcd_dev *smcd) dev_name(&smcd->dev), smcd->pnetid, smcd->pnetid_by_user ? " (user defined)" : ""); - return device_add(&smcd->dev); + rc = device_add(&smcd->dev); + if (rc) { + mutex_lock(&smcd_dev_list.mutex); + list_del(&smcd->list); + mutex_unlock(&smcd_dev_list.mutex); + } + + return rc; } EXPORT_SYMBOL_GPL(smcd_register_dev); |