From: Dan Carpenter Date: Sun, 21 Apr 2013 10:10:03 +0000 (-0300) Subject: [media] media: info leak in media_device_enum_entities() X-Git-Tag: firefly_0821_release~176^2~3573^2~1989 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c06ca8f92b0b23dfd209fea27d71046c9c776910;p=firefly-linux-kernel-4.4.55.git [media] media: info leak in media_device_enum_entities() The last part of the "u_ent.name" buffer isn't cleared so it still has uninitialized stack memory. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 99b80b6f7f67..1957c0df08fd 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -102,9 +102,12 @@ static long media_device_enum_entities(struct media_device *mdev, return -EINVAL; u_ent.id = ent->id; - u_ent.name[0] = '\0'; - if (ent->name) - strlcpy(u_ent.name, ent->name, sizeof(u_ent.name)); + if (ent->name) { + strncpy(u_ent.name, ent->name, sizeof(u_ent.name)); + u_ent.name[sizeof(u_ent.name) - 1] = '\0'; + } else { + memset(u_ent.name, 0, sizeof(u_ent.name)); + } u_ent.type = ent->type; u_ent.revision = ent->revision; u_ent.flags = ent->flags;