Commit a518b86d authored Dec 10, 2009 by Roel Kluin Committed by Alasdair G Kergon Dec 10, 2009

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: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

parent 5339fc2d

drivers/md/dm-ioctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -645,9 +645,9 @@ static struct mapped_device find_device(struct dm_ioctl param)
		* Sneakily write in both the name and the uuid
		* while we have the cell.
		*/
		strncpy(param->name, hc->name, sizeof(param->name));
		strlcpy(param->name, hc->name, sizeof(param->name));
		if (hc->uuid)
		strncpy(param->uuid, hc->uuid, sizeof(param->uuid)-1);
		strlcpy(param->uuid, hc->uuid, sizeof(param->uuid));
		else
		param->uuid[0] = '\0';