1 files changed, 6 insertions, 3 deletions

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;