Commit de8eae36 authored Jul 17, 2014 by Laurent Pinchart Committed by Mauro Carvalho Chehab Sep 21, 2014

[media] media: Use strlcpy instead of custom code



Replace strncpy + manually setting the terminating '\0' with an strlcpy
call.

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 62ea864f

drivers/media/media-device.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -103,10 +103,8 @@ static long media_device_enum_entities(struct media_device *mdev,
		return -EINVAL;

		u_ent.id = ent->id;
		if (ent->name) {
		strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
		u_ent.name[sizeof(u_ent.name) - 1] = '\0';
		}
		if (ent->name)
		strlcpy(u_ent.name, ent->name, sizeof(u_ent.name));
		u_ent.type = ent->type;
		u_ent.revision = ent->revision;
		u_ent.flags = ent->flags;