Skip to content

Commit

Permalink
crypto: scomp - fix req->dst buffer overflow
Browse files Browse the repository at this point in the history
[ Upstream commit 744e188 ]

The req->dst buffer size should be checked before copying from the
scomp_scratch->dst to avoid req->dst buffer overflow problem.

Fixes: 1ab53a7 ("crypto: acomp - add driver-side scomp interface")
Reported-by: [email protected]
Closes: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Chengming Zhou <[email protected]>
Reviewed-by: Barry Song <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
Chengming Zhou authored and gregkh committed Jan 25, 2024
1 parent 490adf8 commit 4df0c94
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions crypto/scompress.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
struct crypto_scomp *scomp = *tfm_ctx;
void **ctx = acomp_request_ctx(req);
struct scomp_scratch *scratch;
unsigned int dlen;
int ret;

if (!req->src || !req->slen || req->slen > SCOMP_SCRATCH_SIZE)
Expand All @@ -135,6 +136,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
if (!req->dlen || req->dlen > SCOMP_SCRATCH_SIZE)
req->dlen = SCOMP_SCRATCH_SIZE;

dlen = req->dlen;

scratch = raw_cpu_ptr(&scomp_scratch);
spin_lock(&scratch->lock);

Expand All @@ -152,6 +155,9 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
ret = -ENOMEM;
goto out;
}
} else if (req->dlen > dlen) {
ret = -ENOSPC;
goto out;
}
scatterwalk_map_and_copy(scratch->dst, req->dst, 0, req->dlen,
1);
Expand Down

0 comments on commit 4df0c94

Please sign in to comment.