Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc1e6315 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: replace strcpy() by strscpy() 



The strcpy() function is being deprecated upstream. Replace
it by the safer strscpy().

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Reviewed-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c0decac1

drivers/media/common/saa7146/saa7146_video.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int vidioc_querycap(struct file *file, void *fh, struct v4l2_capability * 
	struct video_device *vdev = video_devdata(file);

	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;



	strcpy((char *)cap->driver, "saa7146 v4l2");

	strscpy((char *)cap->driver, "saa7146 v4l2", sizeof(cap->driver));

	strscpy((char *)cap->card, dev->ext->name, sizeof(cap->card));

	sprintf((char *)cap->bus_info, "PCI:%s", pci_name(dev->pci));

	cap->device_caps =

drivers/media/dvb-core/dvb_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ static int dvb_frontend_handle_ioctl(struct file *file, 
		struct dvb_frontend_info *info = parg;

		memset(info, 0, sizeof(*info));



		strcpy(info->name, fe->ops.info.name);

		strscpy(info->name, fe->ops.info.name, sizeof(info->name));

		info->symbol_rate_min = fe->ops.info.symbol_rate_min;

		info->symbol_rate_max = fe->ops.info.symbol_rate_max;

		info->symbol_rate_tolerance = fe->ops.info.symbol_rate_tolerance;

drivers/media/dvb-frontends/mt312.c

+6 −3
Original line number Diff line number Diff line
@@ -815,17 +815,20 @@ struct dvb_frontend *mt312_attach(const struct mt312_config *config, 


	switch (state->id) {

	case ID_VP310:

		strcpy(state->frontend.ops.info.name, "Zarlink VP310 DVB-S");

		strscpy(state->frontend.ops.info.name, "Zarlink VP310 DVB-S",

			sizeof(state->frontend.ops.info.name));

		state->xtal = MT312_PLL_CLK;

		state->freq_mult = 9;

		break;

	case ID_MT312:

		strcpy(state->frontend.ops.info.name, "Zarlink MT312 DVB-S");

		strscpy(state->frontend.ops.info.name, "Zarlink MT312 DVB-S",

			sizeof(state->frontend.ops.info.name));

		state->xtal = MT312_PLL_CLK;

		state->freq_mult = 6;

		break;

	case ID_ZL10313:

		strcpy(state->frontend.ops.info.name, "Zarlink ZL10313 DVB-S");

		strscpy(state->frontend.ops.info.name, "Zarlink ZL10313 DVB-S",

			sizeof(state->frontend.ops.info.name));

		state->xtal = MT312_PLL_CLK_10_111;

		state->freq_mult = 9;

		break;

drivers/media/dvb-frontends/zl10039.c

+3 −2
Original line number Diff line number Diff line
@@ -288,8 +288,9 @@ struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe, 
	state->id = state->id & 0x0f;

	switch (state->id) {

	case ID_ZL10039:

		strcpy(fe->ops.tuner_ops.info.name,

			"Zarlink ZL10039 DVB-S tuner");

		strscpy(fe->ops.tuner_ops.info.name,

			"Zarlink ZL10039 DVB-S tuner",

			sizeof(fe->ops.tuner_ops.info.name));

		break;

	default:

		dprintk("Chip ID=%x does not match a known type\n", state->id);

drivers/media/firewire/firedtv-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name) 
		dev_err(fdtv->device, "no frontend for model type %d\n",

			fdtv->type);

	}

	strcpy(fi->name, name);

	strscpy(fi->name, name, sizeof(fi->name));



	fdtv->fe.dvb = &fdtv->adapter;

	fdtv->fe.sec_priv = fdtv;