Menu
▾
▴
[Valgrind-developers] valgrind: r13404: Support Linux kernel AF_BLUETOOTH for bind().
|
From: <sv...@va...> - 2013-05-22 10:21:17
|
mjw 2013-05-22 11:21:10 +0100 (Wed, 22 May 2013)
New Revision: 13404
Log:
Support Linux kernel AF_BLUETOOTH for bind().
Bug #320116. sockaddr_rc might contain some padding which might not be
initialized. Explicitly check the sockaddr_rc fields are set. That also
produces better diagnostics about which field is unitialized.
Added files:
trunk/memcheck/tests/linux/rfcomm.c
trunk/memcheck/tests/linux/rfcomm.stderr.exp
trunk/memcheck/tests/linux/rfcomm.vgtest
Modified files:
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/include/vki/vki-linux.h
trunk/memcheck/tests/linux/Makefile.am
Added: trunk/memcheck/tests/linux/rfcomm.vgtest (+5 -0)
===================================================================
--- trunk/memcheck/tests/linux/rfcomm.vgtest 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/memcheck/tests/linux/rfcomm.vgtest 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -0,0 +1,5 @@
+prog: rfcomm
+vgopts: -q --track-origins=yes
+
+# Will exit -1 if AF_BLUETOOTH not supported
+prereq: ./rfcomm
Modified: trunk/memcheck/tests/linux/Makefile.am (+2 -0)
===================================================================
--- trunk/memcheck/tests/linux/Makefile.am 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/memcheck/tests/linux/Makefile.am 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -8,6 +8,7 @@
capget.vgtest capget.stderr.exp capget.stderr.exp2 \
lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \
lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \
+ rfcomm.vgtest rfcomm.stderr.exp \
sigqueue.vgtest sigqueue.stderr.exp \
stack_changes.stderr.exp stack_changes.stdout.exp \
stack_changes.stdout.exp2 stack_changes.vgtest \
@@ -26,6 +27,7 @@
getregset \
lsframe1 \
lsframe2 \
+ rfcomm \
sigqueue \
stack_changes \
stack_switch \
Added: trunk/memcheck/tests/linux/rfcomm.c (+54 -0)
===================================================================
--- trunk/memcheck/tests/linux/rfcomm.c 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/memcheck/tests/linux/rfcomm.c 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -0,0 +1,54 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+/* user space headers might not be there, define things ourselves. */
+typedef struct {
+ uint8_t b[6];
+} __attribute__((packed)) vui_bdaddr_t;
+
+struct vui_sockaddr_rc {
+ sa_family_t rc_family;
+ vui_bdaddr_t rc_bdaddr;
+ uint8_t rc_channel;
+};
+
+#define VUI_AF_BLUETOOTH 31
+#define VUI_BTPROTO_RFCOMM 3
+
+#define VUI_BDADDR_ANY (&(vui_bdaddr_t) {{0, 0, 0, 0, 0, 0}})
+
+int
+main (int argc, char **argv)
+{
+ int nSocket;
+
+ nSocket = socket(VUI_AF_BLUETOOTH, SOCK_STREAM, VUI_BTPROTO_RFCOMM);
+
+ if (nSocket < 0)
+ {
+ // Not supported, nothing to test...
+ return 1;
+ }
+
+ struct vui_sockaddr_rc aAddr;
+ // Ignore return values.
+
+ // Missing family
+ bind(nSocket, (struct sockaddr *) &aAddr, sizeof(aAddr));
+
+ aAddr.rc_family = VUI_AF_BLUETOOTH;
+ // Missing bdaddr.
+ bind(nSocket, (struct sockaddr *) &aAddr, sizeof(aAddr));
+
+ aAddr.rc_bdaddr = *VUI_BDADDR_ANY;
+ // Missing channel.
+ bind(nSocket, (struct sockaddr *) &aAddr, sizeof(aAddr));
+
+ aAddr.rc_channel = 5;
+ bind(nSocket, (struct sockaddr *) &aAddr, sizeof(aAddr));
+
+ return 0;
+}
Modified: trunk/include/vki/vki-linux.h (+11 -0)
===================================================================
--- trunk/include/vki/vki-linux.h 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/include/vki/vki-linux.h 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -676,6 +676,7 @@
#define VKI_AF_UNIX 1 /* Unix domain sockets */
#define VKI_AF_INET 2 /* Internet IP Protocol */
#define VKI_AF_INET6 10 /* IP version 6 */
+#define VKI_AF_BLUETOOTH 31 /* Bluetooth sockets */
#define VKI_MSG_NOSIGNAL 0x4000 /* Do not generate SIGPIPE */
@@ -2968,6 +2969,16 @@
};
//----------------------------------------------------------------------
+// From linux-3.9.2/include/net/bluetooth/rfcomm.h
+//----------------------------------------------------------------------
+
+struct vki_sockaddr_rc {
+ vki_sa_family_t rc_family;
+ vki_bdaddr_t rc_bdaddr;
+ __vki_u8 rc_channel;
+};
+
+//----------------------------------------------------------------------
// From linux-3.4/include/linux/kvm.h
//----------------------------------------------------------------------
#define KVMIO 0xAE
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c (+8 -0)
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-generic.c 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -941,6 +941,7 @@
struct vki_sockaddr_un* sun = (struct vki_sockaddr_un *)sa;
struct vki_sockaddr_in* sin = (struct vki_sockaddr_in *)sa;
struct vki_sockaddr_in6* sin6 = (struct vki_sockaddr_in6 *)sa;
+ struct vki_sockaddr_rc* rc = (struct vki_sockaddr_rc *)sa;
/* NULL/zero-length sockaddrs are legal */
if ( sa == NULL || salen == 0 ) return;
@@ -981,6 +982,13 @@
(Addr) &sin6->sin6_scope_id, sizeof (sin6->sin6_scope_id) );
break;
+ case VKI_AF_BLUETOOTH:
+ VG_(sprintf) ( outmsg, description, "rc_bdaddr" );
+ PRE_MEM_READ( outmsg, (Addr) &rc->rc_bdaddr, sizeof (rc->rc_bdaddr) );
+ VG_(sprintf) ( outmsg, description, "rc_channel" );
+ PRE_MEM_READ( outmsg, (Addr) &rc->rc_channel, sizeof (rc->rc_channel) );
+ break;
+
default:
VG_(sprintf) ( outmsg, description, "" );
PRE_MEM_READ( outmsg, (Addr) sa, salen );
Added: trunk/memcheck/tests/linux/rfcomm.stderr.exp (+21 -0)
===================================================================
--- trunk/memcheck/tests/linux/rfcomm.stderr.exp 2013-05-22 11:21:08 +01:00 (rev 13403)
+++ trunk/memcheck/tests/linux/rfcomm.stderr.exp 2013-05-22 11:21:10 +01:00 (rev 13404)
@@ -0,0 +1,21 @@
+Syscall param socketcall.bind(my_addr.sa_family) points to uninitialised byte(s)
+ ...
+ by 0x........: main (rfcomm.c:40)
+ Address 0x........ is on thread 1's stack
+ Uninitialised value was created by a stack allocation
+ at 0x........: main (rfcomm.c:25)
+
+Syscall param socketcall.bind(my_addr.rc_bdaddr) points to uninitialised byte(s)
+ ...
+ by 0x........: main (rfcomm.c:44)
+ Address 0x........ is on thread 1's stack
+ Uninitialised value was created by a stack allocation
+ at 0x........: main (rfcomm.c:25)
+
+Syscall param socketcall.bind(my_addr.rc_channel) points to uninitialised byte(s)
+ ...
+ by 0x........: main (rfcomm.c:48)
+ Address 0x........ is on thread 1's stack
+ Uninitialised value was created by a stack allocation
+ at 0x........: main (rfcomm.c:25)
+
|
