diff options
author | Pedro Alves <palves@redhat.com> | 2015-03-07 17:30:46 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2015-03-07 17:30:46 +0000 |
commit | 366c75fc9183e46fe151aefb40f2d55a17815cb7 (patch) | |
tree | 46a0b48ae8dcf84e1317b870e87a66472f2b637d /gdb/common | |
parent | 72df25b28d68fd0b903380ceb06c6b5866eab453 (diff) | |
download | gdb-366c75fc9183e46fe151aefb40f2d55a17815cb7.zip gdb-366c75fc9183e46fe151aefb40f2d55a17815cb7.tar.gz gdb-366c75fc9183e46fe151aefb40f2d55a17815cb7.tar.bz2 |
Fix struct sockaddr/sockaddr_in/sockaddr_un strict aliasing violations
Building gdbserver in C++ mode shows:
gdb/gdbserver/tracepoint.c: In function ‘void* gdb_agent_helper_thread(void*)’:
gdb/gdbserver/tracepoint.c:7190:47: error: cannot convert ‘sockaddr_un*’ to ‘sockaddr*’ for argument ‘2’ to ‘int accept(int, sockaddr*, socklen_t*)’
fd = accept (listen_fd, &sockaddr, &tmp);
A few places in the tree already have an explicit cast to struct
sockaddr *, but that's a strict aliasing violation. Instead of
propagating invalid code, fix this by using a union instead.
gdb/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
* common/gdb_socket.h: New file.
* ser-tcp.c: Include gdb_socket.h. Don't include netinet/in.h nor
sys/socket.h.
(net_open): Use union gdb_sockaddr_u.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
* gdbreplay.c: No longer include <netinet/in.h>, <sys/socket.h>,
or <winsock2.h> here. Instead include "gdb_socket.h".
(remote_open): Use union gdb_sockaddr_u.
* remote-utils.c: No longer include <netinet/in.h>, <sys/socket.h>
or <winsock2.h> here. Instead include "gdb_socket.h".
(handle_accept_event, remote_prepare): Use union gdb_sockaddr_u.
* tracepoint.c: Include "gdb_socket.h" instead of <sys/socket.h>
or <sys/un.h>.
(init_named_socket, gdb_agent_helper_thread): Use union
gdb_sockaddr_u.
Diffstat (limited to 'gdb/common')
-rw-r--r-- | gdb/common/gdb_socket.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/gdb/common/gdb_socket.h b/gdb/common/gdb_socket.h new file mode 100644 index 0000000..a670f74 --- /dev/null +++ b/gdb/common/gdb_socket.h @@ -0,0 +1,43 @@ +/* Copyright (C) 2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef GDB_SOCKET_H +#define GDB_SOCKET_H + +#if USE_WIN32API +#include <winsock2.h> +#else +#include <sys/socket.h> +#include <netinet/in.h> +#if HAVE_SYS_UN_H +#include <sys/un.h> +#endif +#endif + +/* Use this union instead of casts between struct sockaddr <-> struct + sockaddr_foo to avoid strict aliasing violations. */ + +union gdb_sockaddr_u +{ + struct sockaddr sa; + struct sockaddr_in sa_in; +#if HAVE_SYS_UN_H + struct sockaddr_un sa_un; +#endif +}; + +#endif /* GDB_SOCKET_H */ |