Commit 8d8cf163 authored by Xu Panda's avatar Xu Panda Committed by Helge Deller
Browse files

fbdev: omapfb: use strscpy() to instead of strncpy() 



The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL-terminated strings.

Signed-off-by: default avatarXu Panda <xu.panda@zte.com.cn>
Signed-off-by: default avatarYang Yang <yang.yang29@zte.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 9d8b5376

drivers/video/fbdev/omap/omapfb_main.c

+2 −3
Original line number Diff line number Diff line
@@ -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;