Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a57b5d36 authored by Jesper Juhl's avatar Jesper Juhl Committed by Nicholas Bellinger
Browse files

loopback: Fix memory leak in tcm_loop_make_scsi_hba() 



There is a memory leak in tcm_loop_make_scsi_hba().

If all the strstr() calls return NULL and we end up at return ERR_PTR(-EINVAL);
then we'll be leaking the memory previously allocated to tl_hba as
that variable goes out of scope.

This patch should fix the leak.

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 824cc5ff

drivers/target/loopback/tcm_loop.c

+8 −9
Original line number Diff line number Diff line
@@ -1288,22 +1288,21 @@ struct se_wwn *tcm_loop_make_scsi_hba( 
		goto check_len;

	}

	ptr = strstr(name, "iqn.");

	if (ptr) {

		tl_hba->tl_proto_id = SCSI_PROTOCOL_ISCSI;

		goto check_len;

	if (!ptr) {

		printk(KERN_ERR "Unable to locate prefix for emulated Target "

				"Port: %s\n", name);

		ret = -EINVAL;

		goto out;

	}



	printk(KERN_ERR "Unable to locate prefix for emulated Target Port:"

			" %s\n", name);

	return ERR_PTR(-EINVAL);

	tl_hba->tl_proto_id = SCSI_PROTOCOL_ISCSI;



check_len:

	if (strlen(name) >= TL_WWN_ADDR_LEN) {

		printk(KERN_ERR "Emulated NAA %s Address: %s, exceeds"

			" max: %d\n", name, tcm_loop_dump_proto_id(tl_hba),

			TL_WWN_ADDR_LEN);

		kfree(tl_hba);

		return ERR_PTR(-EINVAL);

		ret = -EINVAL;

		goto out;

	}

	snprintf(&tl_hba->tl_wwn_address[0], TL_WWN_ADDR_LEN, "%s", &name[off]);