From: chengming.zhou@linux.dev
To: akpm@linux-foundation.org, chrisl@kernel.org,
davem@davemloft.net, herbert@gondor.apana.org.au,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
nphamcs@gmail.com, syzkaller-bugs@googlegroups.com,
yosryahmed@google.com, 21cnbao@gmail.com
Cc: zhouchengming@bytedance.com,
syzbot+3eff5e51bf1db122a16e@syzkaller.appspotmail.com
Subject: [PATCH v2] crypto: scompress - fix req->dst buffer overflow
Date: Wed, 27 Dec 2023 09:35:23 +0000 [thread overview]
Message-ID: <20231227093523.2735484-1-chengming.zhou@linux.dev> (raw)
In-Reply-To: <0000000000000b05cd060d6b5511@google.com>
From: Chengming Zhou <zhouchengming@bytedance.com>
The req->dst buffer size should be checked before copying from the
scomp_scratch->dst to avoid req->dst buffer overflow problem.
Fixes: 1ab53a77b772 ("crypto: acomp - add driver-side scomp interface")
Reported-by: syzbot+3eff5e51bf1db122a16e@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/0000000000000b05cd060d6b5511@google.com/
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
v2:
- change error code to ENOSPC.
---
crypto/scompress.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/crypto/scompress.c b/crypto/scompress.c
index 442a82c9de7d..b108a30a7600 100644
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -117,6 +117,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)
@@ -128,6 +129,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);
@@ -145,6 +148,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);
--
2.40.1
next prev parent reply other threads:[~2023-12-27 9:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 15:28 [syzbot] [crypto?] general protection fault in scatterwalk_copychunks (5) syzbot
2023-12-26 21:08 ` Nhat Pham
2023-12-26 22:32 ` Chris Li
2023-12-26 23:11 ` Nhat Pham
2023-12-26 23:29 ` Chris Li
2023-12-27 0:23 ` Nhat Pham
2023-12-27 3:51 ` Chengming Zhou
2023-12-27 6:25 ` Barry Song
2023-12-27 6:38 ` Chengming Zhou
2023-12-27 7:01 ` Barry Song
2023-12-27 9:15 ` Chengming Zhou
2023-12-27 11:10 ` Barry Song
2023-12-27 23:26 ` Nhat Pham
2023-12-28 1:43 ` Barry Song
2023-12-28 1:47 ` Barry Song
2023-12-28 19:18 ` Nhat Pham
2023-12-27 7:13 ` Barry Song
2024-01-03 5:31 ` [PATCH RFC] crypto: scompress: remove memcpy if sg_nents is 1 Barry Song
2024-01-03 6:53 ` [syzbot] [crypto?] general protection fault in scatterwalk_copychunks (5) Barry Song
2024-01-03 8:41 ` Chengming Zhou
2023-12-27 2:27 ` [syzbot] [perf?] WARNING in perf_event_open Edward Adam Davis
2023-12-27 2:42 ` [syzbot] [crypto?] general protection fault in scatterwalk_copychunks (5) syzbot
2023-12-27 6:50 ` [PATCH] crypto: scompress - fix req->dst buffer overflow chengming.zhou
2023-12-27 9:26 ` Herbert Xu
2023-12-27 9:28 ` Chengming Zhou
2023-12-27 9:30 ` Herbert Xu
2023-12-27 9:35 ` chengming.zhou [this message]
2023-12-27 11:05 ` [PATCH v2] " Barry Song
2023-12-29 3:30 ` Herbert Xu
2023-12-28 2:28 ` [syzbot] [crypto?] general protection fault in scatterwalk_copychunks (5) Chengming Zhou
2023-12-28 3:58 ` syzbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231227093523.2735484-1-chengming.zhou@linux.dev \
--to=chengming.zhou@linux.dev \
--cc=21cnbao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nphamcs@gmail.com \
--cc=syzbot+3eff5e51bf1db122a16e@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=yosryahmed@google.com \
--cc=zhouchengming@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.