Commit 8eceab19 authored by Douya Le's avatar Douya Le Committed by Herbert Xu
Browse files

crypto: af_alg - limit RX SG extraction by receive buffer budget



Make af_alg_get_rsgl() limit each RX scatterlist extraction to the
remaining receive buffer budget.

af_alg_get_rsgl() currently uses af_alg_readable() only as a gate
before extracting data into the RX scatterlist. Limit each extraction
to the remaining af_alg_rcvbuf(sk) budget so that receive-side
accounting matches the amount of data attached to the request.

If skcipher cannot obtain enough RX space for at least one chunk while
more data remains to be processed, reject the recvmsg call instead of
rounding the request length down to zero.

Fixes: e870456d ("crypto: algif_skcipher - overhaul memory management")
Reported-by: default avatarYifan Wu <yifanwucs@gmail.com>
Reported-by: default avatarJuefei Pu <tomapufckgml@gmail.com>
Co-developed-by: default avatarYuan Tan <yuantan098@gmail.com>
Signed-off-by: default avatarYuan Tan <yuantan098@gmail.com>
Suggested-by: default avatarXin Liu <bird@lzu.edu.cn>
Signed-off-by: default avatarDouya Le <ldy3087146292@gmail.com>
Signed-off-by: default avatarRen Wei <n05ec@lzu.edu.cn>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e0249411
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1229,6 +1229,8 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,

		seglen = min_t(size_t, (maxsize - len),
			       msg_data_left(msg));
		/* Never pin more pages than the remaining RX accounting budget. */
		seglen = min_t(size_t, seglen, af_alg_rcvbuf(sk));

		if (list_empty(&areq->rsgl_list)) {
			rsgl = &areq->first_rsgl;
+5 −0
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
	 * full block size buffers.
	 */
	if (ctx->more || len < ctx->used) {
		if (len < bs) {
			err = -EINVAL;
			goto free;
		}

		len -= len % bs;
		cflags |= CRYPTO_SKCIPHER_REQ_NOTFINAL;
	}