Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2013-04-22 07:07:46 -07:00
commit 7790ff45be
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crypto/algif_hash.c
View file

@ -161,6 +161,8 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,
else if (len < ds) else if (len < ds)
msg->msg_flags |= MSG_TRUNC; msg->msg_flags |= MSG_TRUNC;
msg->msg_namelen = 0;
lock_sock(sk); lock_sock(sk);
if (ctx->more) { if (ctx->more) {
ctx->more = 0; ctx->more = 0;

1
crypto/algif_skcipher.c
View file

@ -432,6 +432,7 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
long copied = 0; long copied = 0;
lock_sock(sk); lock_sock(sk);
msg->msg_namelen = 0;
for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0; for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
iovlen--, iov++) { iovlen--, iov++) {
unsigned long seglen = iov->iov_len; unsigned long seglen = iov->iov_len;