diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-11-21 03:14:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-21 03:52:30 +0100 |
| commit | 68c6beb373955da0886d8f4f5995b3922ceda4be (patch) | |
| tree | 9e5d243a17858f1b21cb4f011d472a7a57187866 /net/socket.c | |
| parent | net: rework recvmsg handler msg_name and msg_namelen logic (diff) | |
| download | linux-68c6beb373955da0886d8f4f5995b3922ceda4be.tar.xz linux-68c6beb373955da0886d8f4f5995b3922ceda4be.zip | |
net: add BUG_ON if kernel advertises msg_namelen > sizeof(struct sockaddr_storage)
In that case it is probable that kernel code overwrote part of the
stack. So we should bail out loudly here.
The BUG_ON may be removed in future if we are sure all protocols are
conformant.
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index fc285564e49e..0b18693f2be6 100644 --- a/net/socket.c +++ b/net/socket.c @@ -221,12 +221,13 @@ static int move_addr_to_user(struct sockaddr_storage *kaddr, int klen, int err; int len; + BUG_ON(klen > sizeof(struct sockaddr_storage)); err = get_user(len, ulen); if (err) return err; if (len > klen) len = klen; - if (len < 0 || len > sizeof(struct sockaddr_storage)) + if (len < 0) return -EINVAL; if (len) { if (audit_sockaddr(klen, kaddr)) |