Skip to content

Commit f014165

Browse files
Zhou Guanghuimartinkpetersen
authored andcommitted
scsi: iscsi: Fix possible memory leak when device_register() failed
If device_register() returns error, the name allocated by the dev_set_name() need be freed. As described in the comment of device_register(), we should use put_device() to give up the reference in the error path. Fix this by calling put_device(), the name will be freed in the kobject_cleanup(), and this patch modified resources will be released by calling the corresponding callback function in the device_release(). Signed-off-by: Zhou Guanghui <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Mike Christie <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 0954256 commit f014165

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

drivers/scsi/scsi_transport_iscsi.c

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ iscsi_create_endpoint(int dd_size)
231231
dev_set_name(&ep->dev, "ep-%d", id);
232232
err = device_register(&ep->dev);
233233
if (err)
234-
goto free_id;
234+
goto put_dev;
235235

236236
err = sysfs_create_group(&ep->dev.kobj, &iscsi_endpoint_group);
237237
if (err)
@@ -245,10 +245,12 @@ iscsi_create_endpoint(int dd_size)
245245
device_unregister(&ep->dev);
246246
return NULL;
247247

248-
free_id:
248+
put_dev:
249249
mutex_lock(&iscsi_ep_idr_mutex);
250250
idr_remove(&iscsi_ep_idr, id);
251251
mutex_unlock(&iscsi_ep_idr_mutex);
252+
put_device(&ep->dev);
253+
return NULL;
252254
free_ep:
253255
kfree(ep);
254256
return NULL;
@@ -766,7 +768,7 @@ iscsi_create_iface(struct Scsi_Host *shost, struct iscsi_transport *transport,
766768

767769
err = device_register(&iface->dev);
768770
if (err)
769-
goto free_iface;
771+
goto put_dev;
770772

771773
err = sysfs_create_group(&iface->dev.kobj, &iscsi_iface_group);
772774
if (err)
@@ -780,9 +782,8 @@ iscsi_create_iface(struct Scsi_Host *shost, struct iscsi_transport *transport,
780782
device_unregister(&iface->dev);
781783
return NULL;
782784

783-
free_iface:
784-
put_device(iface->dev.parent);
785-
kfree(iface);
785+
put_dev:
786+
put_device(&iface->dev);
786787
return NULL;
787788
}
788789
EXPORT_SYMBOL_GPL(iscsi_create_iface);
@@ -1251,15 +1252,15 @@ iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index,
12511252

12521253
err = device_register(&fnode_sess->dev);
12531254
if (err)
1254-
goto free_fnode_sess;
1255+
goto put_dev;
12551256

12561257
if (dd_size)
12571258
fnode_sess->dd_data = &fnode_sess[1];
12581259

12591260
return fnode_sess;
12601261

1261-
free_fnode_sess:
1262-
kfree(fnode_sess);
1262+
put_dev:
1263+
put_device(&fnode_sess->dev);
12631264
return NULL;
12641265
}
12651266
EXPORT_SYMBOL_GPL(iscsi_create_flashnode_sess);
@@ -1299,15 +1300,15 @@ iscsi_create_flashnode_conn(struct Scsi_Host *shost,
12991300

13001301
err = device_register(&fnode_conn->dev);
13011302
if (err)
1302-
goto free_fnode_conn;
1303+
goto put_dev;
13031304

13041305
if (dd_size)
13051306
fnode_conn->dd_data = &fnode_conn[1];
13061307

13071308
return fnode_conn;
13081309

1309-
free_fnode_conn:
1310-
kfree(fnode_conn);
1310+
put_dev:
1311+
put_device(&fnode_conn->dev);
13111312
return NULL;
13121313
}
13131314
EXPORT_SYMBOL_GPL(iscsi_create_flashnode_conn);
@@ -4815,7 +4816,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
48154816
dev_set_name(&priv->dev, "%s", tt->name);
48164817
err = device_register(&priv->dev);
48174818
if (err)
4818-
goto free_priv;
4819+
goto put_dev;
48194820

48204821
err = sysfs_create_group(&priv->dev.kobj, &iscsi_transport_group);
48214822
if (err)
@@ -4850,8 +4851,8 @@ iscsi_register_transport(struct iscsi_transport *tt)
48504851
unregister_dev:
48514852
device_unregister(&priv->dev);
48524853
return NULL;
4853-
free_priv:
4854-
kfree(priv);
4854+
put_dev:
4855+
put_device(&priv->dev);
48554856
return NULL;
48564857
}
48574858
EXPORT_SYMBOL_GPL(iscsi_register_transport);

0 commit comments

Comments
 (0)