]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
misc: fastrpc: Fix fastrpc_map_lookup operation
authorLing Xu <quic_lxu5@quicinc.com>
Fri, 12 Sep 2025 13:12:34 +0000 (14:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Sep 2025 14:34:10 +0000 (16:34 +0200)
Fastrpc driver creates maps for user allocated fd buffers. Before
creating a new map, the map list is checked for any already existing
maps using map fd. Checking with just map fd is not sufficient as the
user can pass offsetted buffer with less size when the map is created
and then a larger size the next time which could result in memory
issues. Check for dma_buf object also when looking up for the map.

Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method")
Cc: stable@kernel.org
Co-developed-by: Ekansh Gupta <ekansh.gupta@oss.qualcomm.com>
Signed-off-by: Ekansh Gupta <ekansh.gupta@oss.qualcomm.com>
Signed-off-by: Ling Xu <quic_lxu5@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Srinivas Kandagatla <srini@kernel.org>
Link: https://lore.kernel.org/r/20250912131236.303102-3-srini@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/fastrpc.c

index 52571916acd4bbc44387f73217d83f08ad80a7f0..1815b1e0c607def8caddfa5b1ed54da5414f417d 100644 (file)
@@ -367,11 +367,16 @@ static int fastrpc_map_lookup(struct fastrpc_user *fl, int fd,
 {
        struct fastrpc_session_ctx *sess = fl->sctx;
        struct fastrpc_map *map = NULL;
+       struct dma_buf *buf;
        int ret = -ENOENT;
 
+       buf = dma_buf_get(fd);
+       if (IS_ERR(buf))
+               return PTR_ERR(buf);
+
        spin_lock(&fl->lock);
        list_for_each_entry(map, &fl->maps, node) {
-               if (map->fd != fd)
+               if (map->fd != fd || map->buf != buf)
                        continue;
 
                if (take_ref) {