diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-08-22 21:45:11 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-09-17 20:13:32 -0400 |
commit | 852b6ed110990891d21bf76b4f46a3c854866f67 (patch) | |
tree | e5251d6b288ae720af4a374198afa37da5233c95 /drivers/target | |
parent | 35d1efe80500a55f9aa01b305a6714ec78c33764 (diff) |
target/iblock: Use match_strlcpy for Opt_udev_path string assignment
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>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/target_core_iblock.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 9ba495477fd2..0f6ece80bffe 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c | |||
@@ -454,14 +454,11 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba, | |||
454 | ret = -EEXIST; | 454 | ret = -EEXIST; |
455 | goto out; | 455 | goto out; |
456 | } | 456 | } |
457 | arg_p = match_strdup(&args[0]); | 457 | if (match_strlcpy(ib_dev->ibd_udev_path, &args[0], |
458 | if (!arg_p) { | 458 | SE_UDEV_PATH_LEN) == 0) { |
459 | ret = -ENOMEM; | 459 | ret = -EINVAL; |
460 | break; | 460 | break; |
461 | } | 461 | } |
462 | snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN, | ||
463 | "%s", arg_p); | ||
464 | kfree(arg_p); | ||
465 | pr_debug("IBLOCK: Referencing UDEV path: %s\n", | 462 | pr_debug("IBLOCK: Referencing UDEV path: %s\n", |
466 | ib_dev->ibd_udev_path); | 463 | ib_dev->ibd_udev_path); |
467 | ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH; | 464 | ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH; |