[dm-devel] [patch 1/3] dm: strncpy does not null terminate string

[akpm at linux-foundation.org]

From: Roel Kluin <roel.kluin at gmail.com>

strlcpy() will always null terminate the string.

Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Cc: Alasdair G Kergon <agk at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---

 drivers/md/dm-ioctl.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/md/dm-ioctl.c~dm-strncpy-does-not-null-terminate-string drivers/md/dm-ioctl.c
--- a/drivers/md/dm-ioctl.c~dm-strncpy-does-not-null-terminate-string
+++ a/drivers/md/dm-ioctl.c
@@ -634,9 +634,9 @@ static struct mapped_device *find_device
 		 * 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';
 
_