Skip to content

Commit 8667a00

Browse files
JustinStitthdeller
authored andcommitted
fbdev: fsl-diu-fb: replace deprecated strncpy with strscpy_pad
strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. A better alternative is strscpy() as it guarantees NUL-termination on the destination buffer. Since we are eventually copying over to userspace, let's ensure we NUL-pad the destination buffer by using the pad variant of strscpy. - core/fb_chrdev.c: 234 | err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id)); Furthermore, we can use the new 2-argument variants of strscpy() and strscpy_pad() introduced by Commit e6584c3 ("string: Allow 2-argument strscpy()") to simplify the syntax even more. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: KSPP#90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent fb3b9c2 commit 8667a00

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/video/fbdev/fsl-diu-fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static void set_fix(struct fb_info *info)
787787
struct fb_var_screeninfo *var = &info->var;
788788
struct mfb_info *mfbi = info->par;
789789

790-
strncpy(fix->id, mfbi->id, sizeof(fix->id));
790+
strscpy_pad(fix->id, mfbi->id);
791791
fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
792792
fix->type = FB_TYPE_PACKED_PIXELS;
793793
fix->accel = FB_ACCEL_NONE;

0 commit comments

Comments
 (0)