xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Código Issues Pull requests Ações Pacotes Projetos Versões Wiki Atividade

media: replace strcpy() by strscpy()

Ver código fonte 
The strcpy() function is being deprecated upstream. Replace
it by the safer strscpy().

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Esse commit está contido em:
Mauro Carvalho Chehab
2018-09-10 16:20:42 -04:00
pai c0decac19d
commit cc1e6315e8
83 arquivos alterados com 225 adições e 199 exclusões
Baixar arquivo de patch Baixar arquivo de diferenças Expandir todos os arquivos Colapsar todos os arquivos

8
drivers/media/usb/em28xx/em28xx-audio.c
Ver arquivo

@@ -938,11 +938,11 @@ static int em28xx_audio_init(struct em28xx *dev)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_em28xx_pcm_capture);
pcm->info_flags = 0;
pcm->private_data = dev;
strcpy(pcm->name, "Empia 28xx Capture");
strscpy(pcm->name, "Empia 28xx Capture", sizeof(pcm->name));
strcpy(card->driver, "Em28xx-Audio");
strcpy(card->shortname, "Em28xx Audio");
strcpy(card->longname, "Empia Em28xx Audio");
strscpy(card->driver, "Em28xx-Audio", sizeof(card->driver));
strscpy(card->shortname, "Em28xx Audio", sizeof(card->shortname));
strscpy(card->longname, "Empia Em28xx Audio", sizeof(card->longname));
INIT_WORK(&adev->wq_trigger, audio_trigger);

3
drivers/media/usb/em28xx/em28xx-i2c.c
Ver arquivo

@@ -985,7 +985,8 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned int bus,
dev->i2c_adap[bus] = em28xx_adap_template;
dev->i2c_adap[bus].dev.parent = &dev->intf->dev;
strcpy(dev->i2c_adap[bus].name, dev_name(&dev->intf->dev));
strscpy(dev->i2c_adap[bus].name, dev_name(&dev->intf->dev),
sizeof(dev->i2c_adap[bus].name));
dev->i2c_bus[bus].bus = bus;
dev->i2c_bus[bus].algo_type = algo_type;

22
drivers/media/usb/em28xx/em28xx-video.c
Ver arquivo

@@ -1675,7 +1675,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
i->type = V4L2_INPUT_TYPE_CAMERA;
strcpy(i->name, iname[INPUT(n)->type]);
strscpy(i->name, iname[INPUT(n)->type], sizeof(i->name));
if (INPUT(n)->type == EM28XX_VMUX_TELEVISION)
i->type = V4L2_INPUT_TYPE_TUNER;
@@ -1716,28 +1716,28 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
switch (a->index) {
case EM28XX_AMUX_VIDEO:
strcpy(a->name, "Television");
strscpy(a->name, "Television", sizeof(a->name));
break;
case EM28XX_AMUX_LINE_IN:
strcpy(a->name, "Line In");
strscpy(a->name, "Line In", sizeof(a->name));
break;
case EM28XX_AMUX_VIDEO2:
strcpy(a->name, "Television alt");
strscpy(a->name, "Television alt", sizeof(a->name));
break;
case EM28XX_AMUX_PHONE:
strcpy(a->name, "Phone");
strscpy(a->name, "Phone", sizeof(a->name));
break;
case EM28XX_AMUX_MIC:
strcpy(a->name, "Mic");
strscpy(a->name, "Mic", sizeof(a->name));
break;
case EM28XX_AMUX_CD:
strcpy(a->name, "CD");
strscpy(a->name, "CD", sizeof(a->name));
break;
case EM28XX_AMUX_AUX:
strcpy(a->name, "Aux");
strscpy(a->name, "Aux", sizeof(a->name));
break;
case EM28XX_AMUX_PCM_OUT:
strcpy(a->name, "PCM");
strscpy(a->name, "PCM", sizeof(a->name));
break;
default:
return -EINVAL;
@@ -1776,7 +1776,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
if (t->index != 0)
return -EINVAL;
strcpy(t->name, "Tuner");
strscpy(t->name, "Tuner", sizeof(t->name));
v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, g_tuner, t);
return 0;
@@ -2045,7 +2045,7 @@ static int radio_g_tuner(struct file *file, void *priv,
if (unlikely(t->index > 0))
return -EINVAL;
strcpy(t->name, "Radio");
strscpy(t->name, "Radio", sizeof(t->name));
v4l2_device_call_all(&dev->v4l2->v4l2_dev, 0, tuner, g_tuner, t);