Skip to content

Commit c99bc90

Browse files
jhovoldgregkh
authored andcommitted
misc: fastrpc: fix memory corruption on probe
commit 9baa141 upstream. 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: f6f9279 ("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>
1 parent 30fd0e2 commit c99bc90

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/misc/fastrpc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,6 +1548,11 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
15481548
of_property_read_u32(dev->of_node, "qcom,nsessions", &sessions);
15491549

15501550
spin_lock_irqsave(&cctx->lock, flags);
1551+
if (cctx->sesscount >= FASTRPC_MAX_SESSIONS) {
1552+
dev_err(&pdev->dev, "too many sessions\n");
1553+
spin_unlock_irqrestore(&cctx->lock, flags);
1554+
return -ENOSPC;
1555+
}
15511556
sess = &cctx->session[cctx->sesscount];
15521557
sess->used = false;
15531558
sess->valid = true;

0 commit comments

Comments
 (0)