Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7790ff45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a kernel memory leak in the algif interface"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif - suppress sending source address information in recvmsg
parents 60d509fa 72a763d8

crypto/algif_hash.c

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock, 
	else if (len < ds)

		msg->msg_flags |= MSG_TRUNC;



	msg->msg_namelen = 0;



	lock_sock(sk);

	if (ctx->more) {

		ctx->more = 0;

crypto/algif_skcipher.c

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, 
	long copied = 0;



	lock_sock(sk);

	msg->msg_namelen = 0;

	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;

	     iovlen--, iov++) {

		unsigned long seglen = iov->iov_len;