瀏覽代碼

crypto: algif - suppress sending source address information in recvmsg

The current code does not set the msg_namelen member to 0 and therefore
makes net/socket.c leak the local sockaddr_storage variable to userland
-- 128 bytes of kernel stack memory. Fix that.

Cc: <stable@vger.kernel.org> # 2.6.38
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Mathias Krause 12 年之前
父節點
當前提交
72a763d805
共有 2 個文件被更改,包括 3 次插入0 次删除
  1. 2 0
      crypto/algif_hash.c
  2. 1 0
      crypto/algif_skcipher.c

+ 2 - 0
crypto/algif_hash.c

@@ -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 - 0
crypto/algif_skcipher.c

@@ -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;