From df08ac3e4ee74ce78793aebf0f8dab6ad5b96529 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 10 Dec 2009 23:52:07 +0000 Subject: [PATCH] --- yaml --- r: 176530 b: refs/heads/master c: a518b86d0b1b6a474f154697dc6f33e0a317ae72 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d68752db958d..4ff5d95b02ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5339fc2d47d1d720e027b9b832bf5aae8fba2ac0 +refs/heads/master: a518b86d0b1b6a474f154697dc6f33e0a317ae72 diff --git a/trunk/drivers/md/dm-ioctl.c b/trunk/drivers/md/dm-ioctl.c index d19854c98184..99de0e4ce831 100644 --- a/trunk/drivers/md/dm-ioctl.c +++ b/trunk/drivers/md/dm-ioctl.c @@ -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';