Commit a518b86d authored by Roel Kluin's avatar Roel Kluin Committed by Alasdair G Kergon

dm ioctl: prefer strlcpy over strncpy

strlcpy() will always null terminate the string.

    The code should already guarantee this as the last bytes are already
    NULs and the string lengths were restricted before being stored in
    hc.  Removing the '-1' becomes necessary so strlcpy() doesn't
    lose the last character of a maximum-length string.
	- agk
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 5339fc2d
...@@ -645,9 +645,9 @@ static struct mapped_device *find_device(struct dm_ioctl *param) ...@@ -645,9 +645,9 @@ static struct mapped_device *find_device(struct dm_ioctl *param)
* Sneakily write in both the name and the uuid * Sneakily write in both the name and the uuid
* while we have the cell. * while we have the cell.
*/ */
strncpy(param->name, hc->name, sizeof(param->name)); strlcpy(param->name, hc->name, sizeof(param->name));
if (hc->uuid) if (hc->uuid)
strncpy(param->uuid, hc->uuid, sizeof(param->uuid)-1); strlcpy(param->uuid, hc->uuid, sizeof(param->uuid));
else else
param->uuid[0] = '\0'; param->uuid[0] = '\0';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment