scsi: iscsi: Fix missing scsi_host_put in error path
PATCH 1/1 scsi: iscsi: Fix missing scsi_host_put in error path
From: Miaoqian Lin <[email protected]>
Add goto to ensure scsi_host_put is called in all error paths of iscsi_set_host_param function. This fixes a potential memory leak when strlen check fails.
Fixes ce51c8170084 ("scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()")
Signed-off-by Miaoqian Lin <[email protected]>
--- drivers/scsi/scsi_transport_iscsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +5 -2
@@ -3182,11 +3182,14 @@ iscsi_set_host_param(struct iscsi_transport *transport, }/* see similar check in iscsi_if_set_param() */ -if (strlen (data) > ev->u.set_host_param.len) -return -EINVAL ; +if (strlen (data) > ev->u.set_host_param.len) { + err = -EINVAL ; + goto out; + } err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len); +out:scsi_host_put (shost);return err; }
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 23 lines · On 3/18/25 4:43 AM, [email protected] wrote:
From: Miaoqian Lin <[email protected]>
Add goto to ensure
scsi_host_putis called in all error paths ofiscsi_set_host_paramfunction. This fixes a potential memory leak when strlen check fails.Fixes ce51c8170084 ("scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()")Signed-off-by Miaoqian Lin <[email protected]>--- drivers/scsi/scsi_transport_iscsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/scsi/scsi_transport_iscsi.c +1
-2@@ -3182,11 +3182,14 @@ iscsi_set_host_param(struct iscsi_transport *transport, }/* see similar check in iscsi_if_set_param() */ -if (strlen (data) > ev->u.set_host_param.len) -return -EINVAL ; +if (strlen (data) > ev->u.set_host_param.len) {
drivers/scsi/scsi_transport_iscsi.c iscsi_set_host_param(struct iscsi_transport *transport, · line 3195
Quoted 10 lines
drivers/scsi/scsi_transport_iscsi.c +4
-0+ err = -EINVAL ; + goto out; + } err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len); +out:scsi_host_put (shost);return err; }
Reviewed-by Mike Christie <[email protected]>
Martin K. Petersen
AppliedQuoted 4 lines
Add goto to ensure
scsi_host_putis called in all error paths ofiscsi_set_host_paramfunction. This fixes a potential memory leak when strlen check fails.
Applied to 6.15/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen