dm: Allow NULL buffer in dm_copy_name_and_uuid if only one vaule requested.

PATCH New Milan Broz 1 participant 1 message Dec 17, 2008 Device mapper

lore

Share & tools

lore

Milan Broz

author

2008-12-17 12:02 UTC #0 lore raw

PATCH 1/1 dm: Allow NULL buffer in dm_copy_name_and_uuid if only one vaule requested.

Allow NULL buffer in dm_copy_name_and_uuid if only one value requested.

Also add maximal length check for string size.

(This patch is needed for device-mapper sysfs extension.)

Signed-off-by Milan Broz <[email protected]>

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

drivers/md/dm-ioctl.c +4 -2

index 7c3ae49..59b3283 100644
@@ -1548,8 +1548,10 @@ int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid)
 		goto out;
 	}
 
-	strcpy(name, hc->name);
-	strcpy(uuid, hc->uuid ? : "");
+	if (name)
+		strncpy(name, hc->name, DM_NAME_LEN);
+	if (uuid)
+		strncpy(uuid, hc->uuid ? : "", DM_UUID_LEN);
 
 out:
 	up_read(&_hash_lock);