fbdev: omapfb: use strscpy() to instead of strncpy()
authorXu Panda <xu.panda@zte.com.cn>
Wed, 28 Dec 2022 01:40:01 +0000 (09:40 +0800)
committerHelge Deller <deller@gmx.de>
Wed, 28 Dec 2022 08:00:16 +0000 (09:00 +0100)
The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL-terminated strings.

Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
Signed-off-by: Helge Deller <deller@gmx.de>
drivers/video/fbdev/omap/omapfb_main.c

index 17cda576568382b041f379f91df5cb12504a0881..1f3df2055ff0d5670cc8b1b79a25937413f79a88 100644 (file)
@@ -1447,7 +1447,7 @@ static int fbinfo_init(struct omapfb_device *fbdev, struct fb_info *info)
        info->fbops = &omapfb_ops;
        info->flags = FBINFO_FLAG_DEFAULT;
 
-       strncpy(fix->id, MODULE_NAME, sizeof(fix->id));
+       strscpy(fix->id, MODULE_NAME, sizeof(fix->id));
 
        info->pseudo_palette = fbdev->pseudo_palette;
 
@@ -1573,8 +1573,7 @@ static int omapfb_find_ctrl(struct omapfb_device *fbdev)
 
        fbdev->ctrl = NULL;
 
-       strncpy(name, conf->lcd.ctrl_name, sizeof(name) - 1);
-       name[sizeof(name) - 1] = '\0';
+       strscpy(name, conf->lcd.ctrl_name, sizeof(name));
 
        if (strcmp(name, "internal") == 0) {
                fbdev->ctrl = fbdev->int_ctrl;