]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
fbtft: Make sure string is NULL terminated
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 20 Nov 2019 09:57:12 +0000 (11:57 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 04:45:21 +0000 (23:45 -0500)
BugLink: https://bugs.launchpad.net/bugs/1859712
[ Upstream commit 21f585480deb4bcf0d92b08879c35d066dfee030 ]

New GCC warns about inappropriate use of strncpy():

drivers/staging/fbtft/fbtft-core.c: In function ‘fbtft_framebuffer_alloc’:
drivers/staging/fbtft/fbtft-core.c:665:2: warning: ‘strncpy’ specified bound 16 equals destination size [-Wstringop-truncation]
  665 |  strncpy(info->fix.id, dev->driver->name, 16);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Later on the copy is being used with the assumption to be NULL terminated.
Make sure string is NULL terminated by switching to snprintf().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191120095716.26628-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/staging/fbtft/fbtft-core.c

index 0cbcbad8f0742913827162d11cd4840a3f489853..b81c6dfa5b249759ff269e3dae4bf396cbebc619 100644 (file)
@@ -780,7 +780,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
        fbdefio->deferred_io =     fbtft_deferred_io;
        fb_deferred_io_init(info);
 
-       strncpy(info->fix.id, dev->driver->name, 16);
+       snprintf(info->fix.id, sizeof(info->fix.id), "%s", dev->driver->name);
        info->fix.type =           FB_TYPE_PACKED_PIXELS;
        info->fix.visual =         FB_VISUAL_TRUECOLOR;
        info->fix.xpanstep =       0;