Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media: vidtv: psi: Add check for kstrdup

Browse source 
[ Upstream commit 76a2c5df6ca8bd8ada45e953b8c72b746f42918d ]

Add check for the return value of kstrdup() and return the error
if it fails in order to avoid NULL pointer dereference.

Fixes: 7a7899f6f58e ("media: vidtv: psi: Implement an Event Information Table (EIT)")
Fixes: c2f78f0cb294 ("media: vidtv: psi: add a Network Information Table (NIT)")
Fixes: f90cf6079bf6 ("media: vidtv: add a bridge driver")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jiasheng Jiang 2023-06-19 16:12:01 +08:00 committed by Ksawlii
parent 18e4afcfa8
commit 1e9676d632
1 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/media/test-drivers/vidtv/vidtv_psi.c
View file

@ -308,16 +308,29 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc
desc->service_name_len = service_name_len;
if (service_name && service_name_len)
if (service_name && service_name_len) {
desc->service_name = kstrdup(service_name, GFP_KERNEL);
if (!desc->service_name)
goto free_desc;
}
desc->provider_name_len = provider_name_len;
if (provider_name && provider_name_len)
if (provider_name && provider_name_len) {
desc->provider_name = kstrdup(provider_name, GFP_KERNEL);
if (!desc->provider_name)
goto free_desc_service_name;
}
vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
free_desc_service_name:
if (service_name && service_name_len)
kfree(desc->service_name);
free_desc:
kfree(desc);
return NULL;
}
struct vidtv_psi_desc_registration
@ -362,8 +375,13 @@ struct vidtv_psi_desc_network_name
desc->length = network_name_len;
if (network_name && network_name_len)
if (network_name && network_name_len) {
desc->network_name = kstrdup(network_name, GFP_KERNEL);
if (!desc->network_name) {
kfree(desc);
return NULL;
}
}
vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
@ -449,15 +467,32 @@ struct vidtv_psi_desc_short_event
iso_language_code = "eng";
desc->iso_language_code = kstrdup(iso_language_code, GFP_KERNEL);
if (!desc->iso_language_code)
goto free_desc;
if (event_name && event_name_len)
if (event_name && event_name_len) {
desc->event_name = kstrdup(event_name, GFP_KERNEL);
if (!desc->event_name)
goto free_desc_language_code;
}
if (text && text_len)
if (text && text_len) {
desc->text = kstrdup(text, GFP_KERNEL);
if (!desc->text)
goto free_desc_event_name;
}
vidtv_psi_desc_chain(head, (struct vidtv_psi_desc *)desc);
return desc;
free_desc_event_name:
if (event_name && event_name_len)
kfree(desc->event_name);
free_desc_language_code:
kfree(desc->iso_language_code);
free_desc:
kfree(desc);
return NULL;
}
struct vidtv_psi_desc *vidtv_psi_desc_clone(struct vidtv_psi_desc *desc)