Skip to content

Commit 96b328d

Browse files
Ola Jeppssongregkh
authored andcommitted
misc: fastrpc: Fix use-after-free race condition for maps
It is possible that in between calling fastrpc_map_get() until map->fl->lock is taken in fastrpc_free_map(), another thread can call fastrpc_map_lookup() and get a reference to a map that is about to be deleted. Rewrite fastrpc_map_get() to only increase the reference count of a map if it's non-zero. Propagate this to callers so they can know if a map is about to be deleted. Fixes this warning: refcount_t: addition on 0; use-after-free. WARNING: CPU: 5 PID: 10100 at lib/refcount.c:25 refcount_warn_saturate ... Call trace: refcount_warn_saturate [fastrpc_map_get inlined] [fastrpc_map_lookup inlined] fastrpc_map_create fastrpc_internal_invoke fastrpc_device_ioctl __arm64_sys_ioctl invoke_syscall Fixes: c68cfb7 ("misc: fastrpc: Add support for context Invoke method") Cc: stable <stable@kernel.org> Signed-off-by: Ola Jeppsson <ola@snap.com> Signed-off-by: Abel Vesa <abel.vesa@linaro.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20221124174941.418450-4-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5bb96c8 commit 96b328d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/misc/fastrpc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,12 @@ static void fastrpc_map_put(struct fastrpc_map *map)
350350
kref_put(&map->refcount, fastrpc_free_map);
351351
}
352352

353-
static void fastrpc_map_get(struct fastrpc_map *map)
353+
static int fastrpc_map_get(struct fastrpc_map *map)
354354
{
355-
if (map)
356-
kref_get(&map->refcount);
355+
if (!map)
356+
return -ENOENT;
357+
358+
return kref_get_unless_zero(&map->refcount) ? 0 : -ENOENT;
357359
}
358360

359361

0 commit comments

Comments
 (0)