diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-11-27 13:40:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-29 22:12:52 +0100 |
| commit | db31c55a6fb245fdbb752a2ca4aefec89afabb06 (patch) | |
| tree | ab94a0065aaa0db14bdca1ae6c92b6e29a086165 /net/socket.c | |
| parent | af_packet: block BH in prb_shutdown_retire_blk_timer() (diff) | |
| download | linux-db31c55a6fb245fdbb752a2ca4aefec89afabb06.tar.xz linux-db31c55a6fb245fdbb752a2ca4aefec89afabb06.zip | |
net: clamp ->msg_namelen instead of returning an error
If kmsg->msg_namelen > sizeof(struct sockaddr_storage) then in the
original code that would lead to memory corruption in the kernel if you
had audit configured. If you didn't have audit configured it was
harmless.
There are some programs such as beta versions of Ruby which use too
large of a buffer and returning an error code breaks them. We should
clamp the ->msg_namelen value instead.
Fixes: 1661bf364ae9 ("net: heap overflow in __audit_sockaddr()")
Reported-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Tested-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 0b18693f2be6..e83c416708af 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1973,7 +1973,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg, if (copy_from_user(kmsg, umsg, sizeof(struct msghdr))) return -EFAULT; if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) - return -EINVAL; + kmsg->msg_namelen = sizeof(struct sockaddr_storage); return 0; } |