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

Commit 6d180253 authored by Jesper Juhl's avatar Jesper Juhl Committed by James Bottomley
Browse files

[SCSI] target: Fix match_strdup() memory leaks 



match_strdup() dynamically allocates memory and it is the responsabillity
of the caller to free that memory. The following three cases:

drivers/target/target_core_file.c:fd_set_configfs_dev_params()
drivers/target/target_core_iblock.c:iblock_set_configfs_dev_params()
drivers/target/target_core_configfs.c:target_core_dev_pr_store_attr_res_aptpl_metadata()

should be kfree()'ing the allocated memory once it is no longer needed.
It also makes sure to return -ENOMEM if the memory allocation in match_strdup()
should fail.  For target_core_configfs.c, this patch adds kfree()'s around
Opt_initiator_fabric, Opt_initiator_node, Opt_initiator_sid, Opt_sa_res_key,
Opt_target_fabric, and Opt_target_node for the Persistent Reservations
Activate Persistence across Target Power Loss (APTPL=1) token parsing.

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarNicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 8fc1858a

drivers/target/target_core_configfs.c

+31 −2
Original line number Diff line number Diff line
@@ -1451,8 +1451,8 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
	size_t count)

{

	struct se_device *dev;

	unsigned char *i_fabric, *t_fabric, *i_port = NULL, *t_port = NULL;

	unsigned char *isid = NULL;

	unsigned char *i_fabric = NULL, *i_port = NULL, *isid = NULL;

	unsigned char *t_fabric = NULL, *t_port = NULL;

	char *orig, *ptr, *arg_p, *opts;

	substring_t args[MAX_OPT_ARGS];

	unsigned long long tmp_ll;
@@ -1488,9 +1488,17 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
		switch (token) {

		case Opt_initiator_fabric:

			i_fabric = match_strdup(&args[0]);

			if (!i_fabric) {

				ret = -ENOMEM;

				goto out;

			}

			break;

		case Opt_initiator_node:

			i_port = match_strdup(&args[0]);

			if (!i_port) {

				ret = -ENOMEM;

				goto out;

			}

			if (strlen(i_port) > PR_APTPL_MAX_IPORT_LEN) {

				printk(KERN_ERR "APTPL metadata initiator_node="

					" exceeds PR_APTPL_MAX_IPORT_LEN: %d\n",
@@ -1501,6 +1509,10 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
			break;

		case Opt_initiator_sid:

			isid = match_strdup(&args[0]);

			if (!isid) {

				ret = -ENOMEM;

				goto out;

			}

			if (strlen(isid) > PR_REG_ISID_LEN) {

				printk(KERN_ERR "APTPL metadata initiator_isid"

					"= exceeds PR_REG_ISID_LEN: %d\n",
@@ -1511,6 +1523,10 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
			break;

		case Opt_sa_res_key:

			arg_p = match_strdup(&args[0]);

			if (!arg_p) {

				ret = -ENOMEM;

				goto out;

			}

			ret = strict_strtoull(arg_p, 0, &tmp_ll);

			if (ret < 0) {

				printk(KERN_ERR "strict_strtoull() failed for"
@@ -1547,9 +1563,17 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
		 */

		case Opt_target_fabric:

			t_fabric = match_strdup(&args[0]);

			if (!t_fabric) {

				ret = -ENOMEM;

				goto out;

			}

			break;

		case Opt_target_node:

			t_port = match_strdup(&args[0]);

			if (!t_port) {

				ret = -ENOMEM;

				goto out;

			}

			if (strlen(t_port) > PR_APTPL_MAX_TPORT_LEN) {

				printk(KERN_ERR "APTPL metadata target_node="

					" exceeds PR_APTPL_MAX_TPORT_LEN: %d\n",
@@ -1592,6 +1616,11 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
			i_port, isid, mapped_lun, t_port, tpgt, target_lun,

			res_holder, all_tg_pt, type);

out:

	kfree(i_fabric);

	kfree(i_port);

	kfree(isid);

	kfree(t_fabric);

	kfree(t_port);

	kfree(orig);

	return (ret == 0) ? count : ret;

}

drivers/target/target_core_file.c

+12 −1
Original line number Diff line number Diff line
@@ -536,15 +536,26 @@ static ssize_t fd_set_configfs_dev_params( 
		token = match_token(ptr, tokens, args);

		switch (token) {

		case Opt_fd_dev_name:

			arg_p = match_strdup(&args[0]);

			if (!arg_p) {

				ret = -ENOMEM;

				break;

			}

			snprintf(fd_dev->fd_dev_name, FD_MAX_DEV_NAME,

					"%s", match_strdup(&args[0]));

					"%s", arg_p);

			kfree(arg_p);

			printk(KERN_INFO "FILEIO: Referencing Path: %s\n",

					fd_dev->fd_dev_name);

			fd_dev->fbd_flags |= FBDF_HAS_PATH;

			break;

		case Opt_fd_dev_size:

			arg_p = match_strdup(&args[0]);

			if (!arg_p) {

				ret = -ENOMEM;

				break;

			}

			ret = strict_strtoull(arg_p, 0, &fd_dev->fd_dev_size);

			kfree(arg_p);

			if (ret < 0) {

				printk(KERN_ERR "strict_strtoull() failed for"

						" fd_dev_size=\n");

drivers/target/target_core_iblock.c

+9 −4
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba, 
					       const char *page, ssize_t count)

{

	struct iblock_dev *ib_dev = se_dev->se_dev_su_ptr;

	char *orig, *ptr, *opts;

	char *orig, *ptr, *arg_p, *opts;

	substring_t args[MAX_OPT_ARGS];

	int ret = 0, arg, token;
@@ -491,9 +491,14 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba, 
				ret = -EEXIST;

				goto out;

			}



			ret = snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,

				"%s", match_strdup(&args[0]));

			arg_p = match_strdup(&args[0]);

			if (!arg_p) {

				ret = -ENOMEM;

				break;

			}

			snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,

					"%s", arg_p);

			kfree(arg_p);

			printk(KERN_INFO "IBLOCK: Referencing UDEV path: %s\n",

					ib_dev->ibd_udev_path);

			ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH;