diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-11-20 21:14:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-20 21:52:30 -0500 |
commit | 68c6beb373955da0886d8f4f5995b3922ceda4be (patch) | |
tree | 9e5d243a17858f1b21cb4f011d472a7a57187866 /net | |
parent | f3d3342602f8bcbf37d7c46641cb9bca7618eb1c (diff) |
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 'net')
-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, | |||
221 | int err; | 221 | int err; |
222 | int len; | 222 | int len; |
223 | 223 | ||
224 | BUG_ON(klen > sizeof(struct sockaddr_storage)); | ||
224 | err = get_user(len, ulen); | 225 | err = get_user(len, ulen); |
225 | if (err) | 226 | if (err) |
226 | return err; | 227 | return err; |
227 | if (len > klen) | 228 | if (len > klen) |
228 | len = klen; | 229 | len = klen; |
229 | if (len < 0 || len > sizeof(struct sockaddr_storage)) | 230 | if (len < 0) |
230 | return -EINVAL; | 231 | return -EINVAL; |
231 | if (len) { | 232 | if (len) { |
232 | if (audit_sockaddr(klen, kaddr)) | 233 | if (audit_sockaddr(klen, kaddr)) |