Messages in this thread Patch in this message | | | Date | Mon, 12 May 2014 02:33:21 +0200 | From | Willy Tarreau <> | Subject | [ 081/143] net: add BUG_ON if kernel advertises msg_namelen > sizeof(struct |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ sockaddr_storage)
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
[ Upstream commit 68c6beb373955da0886d8f4f5995b3922ceda4be ]
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> Signed-off-by: Willy Tarreau <w@1wt.eu> --- net/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/socket.c b/net/socket.c index 2b7be6d..712f977 100644 --- a/net/socket.c +++ b/net/socket.c @@ -216,12 +216,13 @@ int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, 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)) -- 1.7.12.2.21.g234cd45.dirty
| |