diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-22 07:07:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-22 07:07:46 -0700 |
commit | b45c14d1fa707c636ab2f262bdf0b1921b325cdf (patch) | |
tree | 9496ecb6091de7edc6a1a30c7b951ab860d01108 /crypto/algif_hash.c | |
parent | f6b14f477ed629709cbe9fbbc8ec83614ad9d31f (diff) | |
parent | 2bf76653f596c437ba26c20218c748d5bacb7f06 (diff) | |
download | linux-crypto-b45c14d1fa707c636ab2f262bdf0b1921b325cdf.tar.gz linux-crypto-b45c14d1fa707c636ab2f262bdf0b1921b325cdf.zip |
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
Diffstat (limited to '')
-rw-r--r-- | crypto/algif_hash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index ef5356cd..0262210c 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -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; |