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>
このコミットが含まれているのは:
@@ -1100,7 +1100,8 @@ static int dst_get_device_id(struct dst_state *state)
|
||||
/* Card capabilities */
|
||||
state->dst_hw_cap = p_dst_type->dst_feature;
|
||||
pr_err("Recognise [%s]\n", p_dst_type->device_id);
|
||||
strncpy(&state->fw_name[0], p_dst_type->device_id, 6);
|
||||
strscpy((char *)state->fw_name, p_dst_type->device_id,
|
||||
sizeof(state->fw_name));
|
||||
/* Multiple tuners */
|
||||
if (p_dst_type->tuner_type & TUNER_TYPE_MULTI) {
|
||||
switch (use_dst_type) {
|
||||
|
@@ -225,7 +225,7 @@ int mantis_i2c_init(struct mantis_pci *mantis)
|
||||
|
||||
init_waitqueue_head(&mantis->i2c_wq);
|
||||
mutex_init(&mantis->i2c_lock);
|
||||
strncpy(i2c_adapter->name, "Mantis I2C", sizeof(i2c_adapter->name));
|
||||
strscpy(i2c_adapter->name, "Mantis I2C", sizeof(i2c_adapter->name));
|
||||
i2c_set_adapdata(i2c_adapter, mantis);
|
||||
|
||||
i2c_adapter->owner = THIS_MODULE;
|
||||
|
@@ -444,7 +444,7 @@ static int saa7134_go7007_init(struct saa7134_dev *dev)
|
||||
sd = &saa->sd;
|
||||
v4l2_subdev_init(sd, &saa7134_go7007_sd_ops);
|
||||
v4l2_set_subdevdata(sd, saa);
|
||||
strncpy(sd->name, "saa7134-go7007", sizeof(sd->name));
|
||||
strscpy(sd->name, "saa7134-go7007", sizeof(sd->name));
|
||||
|
||||
/* Allocate a couple pages for receiving the compressed stream */
|
||||
saa->top = (u8 *)get_zeroed_page(GFP_KERNEL);
|
||||
|
新しいイシューから参照
ユーザーをブロックする