projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38c5faf
)
misc: fastrpc: Unmap only if buffer is unmapped from DSP
author
Ekansh Gupta
<quic_ekangupt@quicinc.com>
Fri, 13 Oct 2023 12:20:07 +0000
(13:20 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 2 Nov 2023 08:35:31 +0000
(09:35 +0100)
commit
509143385db364c67556a914bef6c9a42fd2c74c
upstream.
For unmapping any buffer from kernel, it should first be unmapped
from DSP. In case unmap from DSP request fails, the map should not
be removed from kernel as it might lead to SMMU faults and other
memory issues.
Fixes:
5c1b97c7d7b7
("misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP")
Cc: stable <stable@kernel.org>
Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link:
https://lore.kernel.org/r/20231013122007.174464-5-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/fastrpc.c
patch
|
blob
|
history
diff --git
a/drivers/misc/fastrpc.c
b/drivers/misc/fastrpc.c
index
62e92b7
..
cc57cc8
100644
(file)
--- a/
drivers/misc/fastrpc.c
+++ b/
drivers/misc/fastrpc.c
@@
-1783,11
+1783,13
@@
static int fastrpc_req_mem_unmap_impl(struct fastrpc_user *fl, struct fastrpc_me
sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_MEM_UNMAP, 1, 0);
err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc,
&args[0]);
- fastrpc_map_put(map);
- if (err)
+ if (err) {
dev_err(dev, "unmmap\tpt fd = %d, 0x%09llx error\n", map->fd, map->raddr);
+ return err;
+ }
+ fastrpc_map_put(map);
- return
err
;
+ return
0
;
}
static int fastrpc_req_mem_unmap(struct fastrpc_user *fl, char __user *argp)