Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec186b9f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

misc: fastrpc: fix memory corruption on probe 



commit 9baa1415d9abdd1e08362ea2dcfadfacee8690b5 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: f6f9279f ("misc: fastrpc: Add Qualcomm fastrpc basic driver model")
Cc: stable@vger.kernel.org      # 5.1
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220829080531.29681-2-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d90ef87

drivers/misc/fastrpc.c

+5 −0
Original line number Diff line number Diff line
@@ -1357,6 +1357,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;