summaryrefslogtreecommitdiffstats
path: root/crypto/scompress.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-03-29 14:09:55 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2019-04-08 14:36:16 +0800
commit6a4d1b18ef00a7b182740b7b4d8a0fcd317368f8 (patch)
tree07869c8b028f77343aa984312331f8ae65915b5c /crypto/scompress.c
parentd6112ea0cb344d6f5ed519991e24f69ba4b43d0e (diff)
downloadlinux-stable-6a4d1b18ef00a7b182740b7b4d8a0fcd317368f8.tar.gz
linux-stable-6a4d1b18ef00a7b182740b7b4d8a0fcd317368f8.tar.bz2
linux-stable-6a4d1b18ef00a7b182740b7b4d8a0fcd317368f8.zip
crypto: scompress - return proper error code for allocation failure
If scomp_acomp_comp_decomp() fails to allocate memory for the destination then we never copy back the data we compressed. It is probably best to return an error code instead 0 in case of failure. I haven't found any user that is using acomp_request_set_params() without the `dst' buffer so there is probably no harm. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/scompress.c')
-rw-r--r--crypto/scompress.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/scompress.c b/crypto/scompress.c
index 6f8305f8c300..aea1a8e5d195 100644
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -171,8 +171,10 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
if (!ret) {
if (!req->dst) {
req->dst = sgl_alloc(req->dlen, GFP_ATOMIC, NULL);
- if (!req->dst)
+ if (!req->dst) {
+ ret = -ENOMEM;
goto out;
+ }
}
scatterwalk_map_and_copy(scratch_dst, req->dst, 0, req->dlen,
1);