From: Xu Panda <xu.pa...@zte.com.cn>

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.pa...@zte.com.cn>
Signed-off-by: Yang Yang <yang.yan...@zte.com>
---
 drivers/video/fbdev/omap/omapfb_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/video/fbdev/omap/omapfb_main.c 
b/drivers/video/fbdev/omap/omapfb_main.c
index 17cda5765683..1f3df2055ff0 100644
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -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;
-- 
2.15.2

Reply via email to