samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: adsprpc: To avoid null pointer dereference

Browse Source 
To log error for fastrpc_mmap_remove_ssr and
compat_fastrpc_get_dsp_info for avoiding null pointer
dereferences leading to kw issues.

Change-Id: I0f759ce5d9c3100a5cff3e61ad1499f6eb1b55dd
Signed-off-by: Ansa Ahmed <ansaahme@qti.qualcomm.com>
This commit is contained in:
Vamsi Krishna Gattupalli
2023-01-11 19:30:36 +05:30
committed by Gerrit - the friendly Code Review server
parent 9f5f25be96
commit bfd12fbf25
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dsp/adsprpc.c
View File

@@ -4713,7 +4713,7 @@ static int fastrpc_mmap_remove_ssr(struct fastrpc_file *fl, int locked)
match = NULL; match = NULL;
spin_lock_irqsave(&me->hlock, irq_flags); spin_lock_irqsave(&me->hlock, irq_flags);
hlist_for_each_entry_safe(map, n, &me->maps, hn) { hlist_for_each_entry_safe(map, n, &me->maps, hn) {
if (map->servloc_name && if (map->servloc_name && fl &&
fl->servloc_name && !strcmp(map->servloc_name, fl->servloc_name)) { fl->servloc_name && !strcmp(map->servloc_name, fl->servloc_name)) {
match = map; match = map;
if (map->is_persistent && map->in_use) { if (map->is_persistent && map->in_use) {
@@ -8287,8 +8287,9 @@ static int __init fastrpc_device_init(void)
VERIFY(err, NULL != (buf = kzalloc(sizeof(*buf), GFP_KERNEL))); VERIFY(err, NULL != (buf = kzalloc(sizeof(*buf), GFP_KERNEL)));
if (err) { if (err) {
err = -ENOMEM; err = -ENOMEM;
ADSPRPC_WARN("%s: CMA alloc failed err 0x%x\n", ADSPRPC_ERR("%s: CMA alloc failed err 0x%x\n",
__func__, err); __func__, err);
goto device_create_bail;
} }
INIT_HLIST_NODE(&buf->hn); INIT_HLIST_NODE(&buf->hn);
buf->virt = region_vaddr; buf->virt = region_vaddr;

7
dsp/adsprpc_compat.c
View File

@@ -772,11 +772,16 @@ static int compat_fastrpc_get_dsp_info(struct fastrpc_file *fl,
struct fastrpc_ioctl_capability *info = NULL; struct fastrpc_ioctl_capability *info = NULL;
compat_uint_t u; compat_uint_t u;
int err = 0; int err = 0;
size_t info_size = 0;
info32 = compat_ptr(arg); info32 = compat_ptr(arg);
VERIFY(err, NULL != (info = kmalloc( VERIFY(err, NULL != (info = kmalloc(
sizeof(*info), GFP_KERNEL))); sizeof(*info), GFP_KERNEL)));
info_size = sizeof(*info);
if (err) {
ADSPRPC_ERR("allocation failed for size 0x%zx\n", info_size);
return err;
}
err = get_user(u, &info32->domain); err = get_user(u, &info32->domain);
if (err) if (err)
return err; return err;