Commit d245f43a authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

misc: fastrpc: fix memory corruption on open

The probe session-duplication overflow check incremented the session
count also when there were no more available sessions so that memory
beyond the fixed-size slab-allocated session array could be corrupted in
fastrpc_session_alloc() on open().

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-3-johan+linaro@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9baa1415
...@@ -1948,7 +1948,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev) ...@@ -1948,7 +1948,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
spin_unlock_irqrestore(&cctx->lock, flags); spin_unlock_irqrestore(&cctx->lock, flags);
return -ENOSPC; return -ENOSPC;
} }
sess = &cctx->session[cctx->sesscount]; sess = &cctx->session[cctx->sesscount++];
sess->used = false; sess->used = false;
sess->valid = true; sess->valid = true;
sess->dev = dev; sess->dev = dev;
...@@ -1961,13 +1961,12 @@ static int fastrpc_cb_probe(struct platform_device *pdev) ...@@ -1961,13 +1961,12 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
struct fastrpc_session_ctx *dup_sess; struct fastrpc_session_ctx *dup_sess;
for (i = 1; i < sessions; i++) { for (i = 1; i < sessions; i++) {
if (cctx->sesscount++ >= FASTRPC_MAX_SESSIONS) if (cctx->sesscount >= FASTRPC_MAX_SESSIONS)
break; break;
dup_sess = &cctx->session[cctx->sesscount]; dup_sess = &cctx->session[cctx->sesscount++];
memcpy(dup_sess, sess, sizeof(*dup_sess)); memcpy(dup_sess, sess, sizeof(*dup_sess));
} }
} }
cctx->sesscount++;
spin_unlock_irqrestore(&cctx->lock, flags); spin_unlock_irqrestore(&cctx->lock, flags);
rc = dma_set_mask(dev, DMA_BIT_MASK(32)); rc = dma_set_mask(dev, DMA_BIT_MASK(32));
if (rc) { if (rc) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment