summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2022-08-29 10:05:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-01 16:13:07 +0200
commit9baa1415d9abdd1e08362ea2dcfadfacee8690b5 (patch)
treea5ba902340271a7582c78dc621f1609acb8b18a1
parent5ef251b9b73ff9f62aa5ac60427af05b2b594a55 (diff)
downloadlinux-9baa1415d9abdd1e08362ea2dcfadfacee8690b5.tar.gz
linux-9baa1415d9abdd1e08362ea2dcfadfacee8690b5.tar.bz2
linux-9baa1415d9abdd1e08362ea2dcfadfacee8690b5.zip
misc: fastrpc: fix memory corruption on probe
Add the missing sanity check on the probed-session count to avoid corrupting memory beyond the fixed-size slab-allocated session array when there are more than FASTRPC_MAX_SESSIONS sessions defined in the devicetree. Fixes: f6f9279f2bf0 ("misc: fastrpc: Add Qualcomm fastrpc basic driver model") Cc: stable@vger.kernel.org # 5.1 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20220829080531.29681-2-johan+linaro@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/fastrpc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 93ebd174d848..88091778c1b8 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -1943,6 +1943,11 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
of_property_read_u32(dev->of_node, "qcom,nsessions", &sessions);
spin_lock_irqsave(&cctx->lock, flags);
+ if (cctx->sesscount >= FASTRPC_MAX_SESSIONS) {
+ dev_err(&pdev->dev, "too many sessions\n");
+ spin_unlock_irqrestore(&cctx->lock, flags);
+ return -ENOSPC;
+ }
sess = &cctx->session[cctx->sesscount];
sess->used = false;
sess->valid = true;