Commit 85709cbf authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 060162c1

drivers/media/dvb-frontends/as102_fe.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ struct dvb_frontend *as102_attach(const char *name, 


	/* init frontend callback ops */

	memcpy(&fe->ops, &as102_fe_ops, sizeof(struct dvb_frontend_ops));

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

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



	return fe;

drivers/media/dvb-frontends/dib7000p.c

+2 −1
Original line number Diff line number Diff line
@@ -2774,7 +2774,8 @@ static struct dvb_frontend *dib7000p_init(struct i2c_adapter *i2c_adap, u8 i2c_a 
	dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr);



	/* init 7090 tuner adapter */

	strncpy(st->dib7090_tuner_adap.name, "DiB7090 tuner interface", sizeof(st->dib7090_tuner_adap.name));

	strscpy(st->dib7090_tuner_adap.name, "DiB7090 tuner interface",

		sizeof(st->dib7090_tuner_adap.name));

	st->dib7090_tuner_adap.algo = &dib7090_tuner_xfer_algo;

	st->dib7090_tuner_adap.algo_data = NULL;

	st->dib7090_tuner_adap.dev.parent = st->i2c_adap->dev.parent;

drivers/media/dvb-frontends/dib8000.c

+2 −2
Original line number Diff line number Diff line
@@ -4458,7 +4458,7 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad 
	dibx000_init_i2c_master(&state->i2c_master, DIB8000, state->i2c.adap, state->i2c.addr);



	/* init 8096p tuner adapter */

	strncpy(state->dib8096p_tuner_adap.name, "DiB8096P tuner interface",

	strscpy(state->dib8096p_tuner_adap.name, "DiB8096P tuner interface",

		sizeof(state->dib8096p_tuner_adap.name));

	state->dib8096p_tuner_adap.algo = &dib8096p_tuner_xfer_algo;

	state->dib8096p_tuner_adap.algo_data = NULL;

drivers/media/dvb-frontends/dib9000.c

+4 −2
Original line number Diff line number Diff line
@@ -2521,7 +2521,8 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c 
	dibx000_init_i2c_master(&st->i2c_master, DIB7000MC, st->i2c.i2c_adap, st->i2c.i2c_addr);



	st->tuner_adap.dev.parent = i2c_adap->dev.parent;

	strncpy(st->tuner_adap.name, "DIB9000_FW TUNER ACCESS", sizeof(st->tuner_adap.name));

	strscpy(st->tuner_adap.name, "DIB9000_FW TUNER ACCESS",

		sizeof(st->tuner_adap.name));

	st->tuner_adap.algo = &dib9000_tuner_algo;

	st->tuner_adap.algo_data = NULL;

	i2c_set_adapdata(&st->tuner_adap, st);
@@ -2529,7 +2530,8 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c 
		goto error;



	st->component_bus.dev.parent = i2c_adap->dev.parent;

	strncpy(st->component_bus.name, "DIB9000_FW COMPONENT BUS ACCESS", sizeof(st->component_bus.name));

	strscpy(st->component_bus.name, "DIB9000_FW COMPONENT BUS ACCESS",

		sizeof(st->component_bus.name));

	st->component_bus.algo = &dib9000_component_bus_algo;

	st->component_bus.algo_data = NULL;

	st->component_bus_speed = 340;

drivers/media/dvb-frontends/dvb-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, 
	memcpy(&fe->ops.tuner_ops, &dvb_pll_tuner_ops,

	       sizeof(struct dvb_tuner_ops));



	strncpy(fe->ops.tuner_ops.info.name, desc->name,

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

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



	fe->ops.tuner_ops.info.frequency_min_hz = desc->min;