Commit bb175ce7 authored by Sukrut Bellary's avatar Sukrut Bellary Committed by Xiaomeng Zhang
Browse files

misc: fastrpc: Fix double free of 'buf' in error path 

stable inclusion
from stable-v6.10.10
commit bfc1704d909dc9911a558b1a5833d3d61a43a1f2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IATRLJ
CVE: CVE-2024-46741

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bfc1704d909dc9911a558b1a5833d3d61a43a1f2



--------------------------------

commit e8c276d4dc0e19ee48385f74426aebc855b49aaf upstream.

smatch warning:
drivers/misc/fastrpc.c:1926 fastrpc_req_mmap() error: double free of 'buf'

In fastrpc_req_mmap() error path, the fastrpc buffer is freed in
fastrpc_req_munmap_impl() if unmap is successful.

But in the end, there is an unconditional call to fastrpc_buf_free().
So the above case triggers the double free of fastrpc buf.

Fixes: 72fa6f78 ("misc: fastrpc: Rework fastrpc_req_munmap")
Reviewed-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarSukrut Bellary <sukrut.bellary@linux.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/r/20240902141409.70371-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarXiaomeng Zhang <zhangxiaomeng13@huawei.com>
parent 047636a2

drivers/misc/fastrpc.c

+2 −3
Original line number Diff line number Diff line
@@ -1912,7 +1912,8 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) 
				      &args[0]);

	if (err) {

		dev_err(dev, "mmap error (len 0x%08llx)\n", buf->size);

		goto err_invoke;

		fastrpc_buf_free(buf);

		return err;

	}



	/* update the buffer to be able to deallocate the memory on the DSP */
@@ -1950,8 +1951,6 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) 


err_assign:

	fastrpc_req_munmap_impl(fl, buf);

err_invoke:

	fastrpc_buf_free(buf);



	return err;

}