Commit b4394c34 authored Jul 19, 2018 by Linus Torvalds

crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes an allocation error-path bug in af_alg discovered by
  syzkaller"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: af_alg - Initialize sg_num_bytes in error code path

parents 024ddc0c 2546da99

crypto/af_alg.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1155,8 +1155,10 @@ int af_alg_get_rsgl(struct sock sk, struct msghdr msg, int flags,

		/* make one iovec available as scatterlist */
		err = af_alg_make_sg(&rsgl->sgl, &msg->msg_iter, seglen);
		if (err < 0)
		if (err < 0) {
		rsgl->sg_num_bytes = 0;
		return err;
		}

		/* chain the new scatterlist with previous one */
		if (areq->last_rsgl)