]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
target/iblock: Use match_strlcpy for Opt_udev_path string assignment
authorNicholas Bellinger <nab@linux-iscsi.org>
Thu, 23 Aug 2012 01:45:11 +0000 (18:45 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Thu, 23 Aug 2012 01:45:11 +0000 (18:45 -0700)
Following commit dbc6e0222 from Al Viro for fileio, go ahead and make
Opt_udev_path within iblock_set_configfs_dev_params use match_strlcpy
instead of the match_strdup -> snprintf -> kfree equivalent.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_iblock.c

index 76db75e836ede701c2aed6090a212fdf1a08ad10..0cd1a1ca1a5d22732094abf7d5b0888442c0f08d 100644 (file)
@@ -441,14 +441,11 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba,
                                ret = -EEXIST;
                                goto out;
                        }
-                       arg_p = match_strdup(&args[0]);
-                       if (!arg_p) {
-                               ret = -ENOMEM;
+                       if (match_strlcpy(ib_dev->ibd_udev_path, &args[0],
+                               SE_UDEV_PATH_LEN) == 0) {
+                               ret = -EINVAL;
                                break;
                        }
-                       snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,
-                                       "%s", arg_p);
-                       kfree(arg_p);
                        pr_debug("IBLOCK: Referencing UDEV path: %s\n",
                                        ib_dev->ibd_udev_path);
                        ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH;