Commit 5a15468b authored by Sam Ravnborg's avatar Sam Ravnborg

video: fbdev: uvesafb: Fix string related warnings

Two W=1 string related warnings.
- Using strncpy to copy string without null-termination generates a
  warning.  Use memcpy to copy only the relevant chars

- Fix a potential bug with a very long string, subtract one from the
  length to make room for the termination null.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Michal Januszewski <spock@gentoo.org>
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20201128224114.1033617-27-sam@ravnborg.org
parent ab2b29e6
...@@ -423,7 +423,7 @@ static int uvesafb_vbe_getinfo(struct uvesafb_ktask *task, ...@@ -423,7 +423,7 @@ static int uvesafb_vbe_getinfo(struct uvesafb_ktask *task,
task->t.flags = TF_VBEIB; task->t.flags = TF_VBEIB;
task->t.buf_len = sizeof(struct vbe_ib); task->t.buf_len = sizeof(struct vbe_ib);
task->buf = &par->vbe_ib; task->buf = &par->vbe_ib;
strncpy(par->vbe_ib.vbe_signature, "VBE2", 4); memcpy(par->vbe_ib.vbe_signature, "VBE2", 4);
err = uvesafb_exec(task); err = uvesafb_exec(task);
if (err || (task->t.regs.eax & 0xffff) != 0x004f) { if (err || (task->t.regs.eax & 0xffff) != 0x004f) {
...@@ -1871,7 +1871,7 @@ static ssize_t v86d_show(struct device_driver *dev, char *buf) ...@@ -1871,7 +1871,7 @@ static ssize_t v86d_show(struct device_driver *dev, char *buf)
static ssize_t v86d_store(struct device_driver *dev, const char *buf, static ssize_t v86d_store(struct device_driver *dev, const char *buf,
size_t count) size_t count)
{ {
strncpy(v86d_path, buf, PATH_MAX); strncpy(v86d_path, buf, PATH_MAX - 1);
return count; return count;
} }
static DRIVER_ATTR_RW(v86d); static DRIVER_ATTR_RW(v86d);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment