summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/pulse8-cec
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2018-09-10 14:19:16 +0200
committerMauro Carvalho Chehab2019-03-29 15:26:13 +0100
commit85709cbf152465c77a9c2de48a6f4ef23c8c3d83 (patch)
tree4dc492b6da48d0d1f9ede150c0c2386f4efb6438 /drivers/media/usb/pulse8-cec
parentmedia: vim2m: Fix RGB 565 BE/LE support (diff)
downloadkernel-qcow2-linux-85709cbf152465c77a9c2de48a6f4ef23c8c3d83.tar.gz
kernel-qcow2-linux-85709cbf152465c77a9c2de48a6f4ef23c8c3d83.tar.xz
kernel-qcow2-linux-85709cbf152465c77a9c2de48a6f4ef23c8c3d83.zip
media: replace strncpy() by strscpy()
The strncpy() function is being deprecated upstream. Replace it by the safer strscpy(). While here, replace a few occurences of strlcpy() that were recently added to also use strscpy(). Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb/pulse8-cec')
-rw-r--r--drivers/media/usb/pulse8-cec/pulse8-cec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c
index b085b14f3f87..ea9ee74fa336 100644
--- a/drivers/media/usb/pulse8-cec/pulse8-cec.c
+++ b/drivers/media/usb/pulse8-cec/pulse8-cec.c
@@ -435,7 +435,7 @@ static int pulse8_setup(struct pulse8 *pulse8, struct serio *serio,
err = pulse8_send_and_wait(pulse8, cmd, 1, cmd[0], 0);
if (err)
return err;
- strncpy(log_addrs->osd_name, data, 13);
+ strscpy(log_addrs->osd_name, data, sizeof(log_addrs->osd_name));
dev_dbg(pulse8->dev, "OSD name: %s\n", log_addrs->osd_name);
return 0;
@@ -566,7 +566,7 @@ static int pulse8_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)
char *osd_str = cmd + 1;
cmd[0] = MSGCODE_SET_OSD_NAME;
- strncpy(cmd + 1, adap->log_addrs.osd_name, 13);
+ strscpy(cmd + 1, adap->log_addrs.osd_name, sizeof(cmd) - 1);
if (osd_len < 4) {
memset(osd_str + osd_len, ' ', 4 - osd_len);
osd_len = 4;