|
 |
8f7639 |
From 5a9b0f1ef83300f853e77ada03515c8542c1cfe0 Mon Sep 17 00:00:00 2001
|
|
|
8f7639 |
From: Eugene Syromyatnikov <evgsyr@gmail.com>
|
|
|
8f7639 |
Date: Thu, 29 Aug 2019 19:03:51 +0200
|
|
|
8f7639 |
Subject: [PATCH] sockaddr: properly decode sockaddr_hci addresses without
|
|
|
8f7639 |
hci_channel
|
|
|
8f7639 |
|
|
|
8f7639 |
Before Linux commit v2.6.38-rc1~476^2~14^2~3^2~43^2~9,
|
|
|
8f7639 |
struct sockaddr_hci did not contain hci_channel field.
|
|
|
8f7639 |
|
|
|
8f7639 |
* configure.ac (AC_CHECK_HEADERS([bluetooth/bluetooth.h])): Add check
|
|
|
8f7639 |
for struct sockaddr_hci.hci_channel.
|
|
|
8f7639 |
* sockaddr.c (print_sockaddr_data_bt): Decode struct sockaddr_hci
|
|
|
8f7639 |
without hci_channel field.
|
|
|
8f7639 |
* tests/net-sockaddr.c (check_hci): Add check for struct sockaddr_hci
|
|
|
8f7639 |
decoding without hci_channel field; guard hci_channel with #ifdef
|
|
|
8f7639 |
HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL.
|
|
|
8f7639 |
(check_raw): Remove "len++", as 4-byte AF_BLUETOOTH socket addresses are
|
|
|
8f7639 |
interpreted as struct sockaddr_hci without hci_channel field.
|
|
|
8f7639 |
---
|
|
|
8f7639 |
configure.ac | 3 +++
|
|
|
8f7639 |
sockaddr.c | 16 +++++++++++++---
|
|
|
8f7639 |
tests/net-sockaddr.c | 18 ++++++++++++++----
|
|
|
8f7639 |
3 files changed, 30 insertions(+), 7 deletions(-)
|
|
|
8f7639 |
|
|
|
8f7639 |
Index: strace-5.1/configure.ac
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/configure.ac 2019-08-29 19:10:22.380362280 +0200
|
|
|
8f7639 |
+++ strace-5.1/configure.ac 2019-08-29 19:11:11.240744864 +0200
|
|
|
8f7639 |
@@ -465,6 +465,9 @@
|
|
|
8f7639 |
])
|
|
|
8f7639 |
|
|
|
8f7639 |
AC_CHECK_HEADERS([bluetooth/bluetooth.h], [
|
|
|
8f7639 |
+ AC_CHECK_MEMBERS([struct sockaddr_hci.hci_channel],,,
|
|
|
8f7639 |
+ [#include <bluetooth/bluetooth.h>
|
|
|
8f7639 |
+ #include <bluetooth/hci.h>])
|
|
|
8f7639 |
AC_CHECK_MEMBERS([struct sockaddr_l2.l2_bdaddr_type],,,
|
|
|
8f7639 |
[#include <bluetooth/bluetooth.h>
|
|
|
8f7639 |
#include <bluetooth/l2cap.h>])
|
|
|
8f7639 |
Index: strace-5.1/sockaddr.c
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/sockaddr.c 2019-08-29 19:11:11.240744864 +0200
|
|
|
8f7639 |
+++ strace-5.1/sockaddr.c 2019-08-29 19:13:01.275354429 +0200
|
|
|
8f7639 |
@@ -599,12 +599,21 @@
|
|
|
8f7639 |
};
|
|
|
8f7639 |
|
|
|
8f7639 |
switch (addrlen) {
|
|
|
8f7639 |
+ case offsetofend(struct sockaddr_hci, hci_dev):
|
|
|
8f7639 |
case sizeof(struct sockaddr_hci): {
|
|
|
8f7639 |
const struct sockaddr_hci *const hci = buf;
|
|
|
8f7639 |
- tprintf("hci_dev=htobs(%hu), hci_channel=",
|
|
|
8f7639 |
- btohs(hci->hci_dev));
|
|
|
8f7639 |
- printxval_index(hci_channels, hci->hci_channel,
|
|
|
8f7639 |
- "HCI_CHANNEL_???");
|
|
|
8f7639 |
+ tprintf("hci_dev=htobs(%hu)", btohs(hci->hci_dev));
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ /*
|
|
|
8f7639 |
+ * hci_channel field has been introduced
|
|
|
8f7639 |
+ * Linux commit in v2.6.38-rc1~476^2~14^2~3^2~43^2~9.
|
|
|
8f7639 |
+ */
|
|
|
8f7639 |
+ if (addrlen == sizeof(struct sockaddr_hci)) {
|
|
|
8f7639 |
+ tprints(", hci_channel=");
|
|
|
8f7639 |
+ printxval_index(hci_channels, hci->hci_channel,
|
|
|
8f7639 |
+ "HCI_CHANNEL_???");
|
|
|
8f7639 |
+ }
|
|
|
8f7639 |
+
|
|
|
8f7639 |
break;
|
|
|
8f7639 |
}
|
|
|
8f7639 |
case sizeof(struct sockaddr_sco): {
|
|
|
8f7639 |
Index: strace-5.1/tests/net-sockaddr.c
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/tests/net-sockaddr.c 2019-08-29 19:10:22.380362280 +0200
|
|
|
8f7639 |
+++ strace-5.1/tests/net-sockaddr.c 2019-08-29 19:11:11.240744864 +0200
|
|
|
8f7639 |
@@ -543,11 +543,22 @@
|
|
|
8f7639 |
TAIL_ALLOC_OBJECT_VAR_PTR(struct sockaddr_hci, hci);
|
|
|
8f7639 |
hci->hci_family = AF_BLUETOOTH;
|
|
|
8f7639 |
hci->hci_dev = htobs(h_port);
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
hci->hci_channel = HCI_CHANNEL_RAW;
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
unsigned int len = sizeof(*hci);
|
|
|
8f7639 |
- int ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ int ret = connect(-1, (void *) hci, 4);
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
+ "}, 4) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+ h_port, ret);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
- ", hci_channel=HCI_CHANNEL_RAW}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
+ ", hci_channel=HCI_CHANNEL_RAW"
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
+ "}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
h_port, len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
@@ -700,9 +711,8 @@
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
|
|
|
8f7639 |
u.sa->sa_family = AF_BLUETOOTH;
|
|
|
8f7639 |
- ++len;
|
|
|
8f7639 |
ret = connect(-1, (void *) u.st, len);
|
|
|
8f7639 |
- printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"00\"}, %u)"
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"0\"}, %u)"
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
Index: strace-5.1/tests-m32/net-sockaddr.c
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/tests-m32/net-sockaddr.c 2019-03-18 03:40:16.000000000 +0100
|
|
|
8f7639 |
+++ strace-5.1/tests-m32/net-sockaddr.c 2019-08-29 19:16:28.327738043 +0200
|
|
|
8f7639 |
@@ -543,11 +543,22 @@
|
|
|
8f7639 |
TAIL_ALLOC_OBJECT_VAR_PTR(struct sockaddr_hci, hci);
|
|
|
8f7639 |
hci->hci_family = AF_BLUETOOTH;
|
|
|
8f7639 |
hci->hci_dev = htobs(h_port);
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
hci->hci_channel = HCI_CHANNEL_RAW;
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
unsigned int len = sizeof(*hci);
|
|
|
8f7639 |
- int ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ int ret = connect(-1, (void *) hci, 4);
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
+ "}, 4) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+ h_port, ret);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
- ", hci_channel=HCI_CHANNEL_RAW}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
+ ", hci_channel=HCI_CHANNEL_RAW"
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
+ "}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
h_port, len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
@@ -700,9 +711,8 @@
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
|
|
|
8f7639 |
u.sa->sa_family = AF_BLUETOOTH;
|
|
|
8f7639 |
- ++len;
|
|
|
8f7639 |
ret = connect(-1, (void *) u.st, len);
|
|
|
8f7639 |
- printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"00\"}, %u)"
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"0\"}, %u)"
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
Index: strace-5.1/tests-mx32/net-sockaddr.c
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/tests-mx32/net-sockaddr.c 2019-03-18 03:40:16.000000000 +0100
|
|
|
8f7639 |
+++ strace-5.1/tests-mx32/net-sockaddr.c 2019-08-29 19:16:30.805706731 +0200
|
|
|
8f7639 |
@@ -543,11 +543,22 @@
|
|
|
8f7639 |
TAIL_ALLOC_OBJECT_VAR_PTR(struct sockaddr_hci, hci);
|
|
|
8f7639 |
hci->hci_family = AF_BLUETOOTH;
|
|
|
8f7639 |
hci->hci_dev = htobs(h_port);
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
hci->hci_channel = HCI_CHANNEL_RAW;
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
unsigned int len = sizeof(*hci);
|
|
|
8f7639 |
- int ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ int ret = connect(-1, (void *) hci, 4);
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
+ "}, 4) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+ h_port, ret);
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+ ret = connect(-1, (void *) hci, len);
|
|
|
8f7639 |
printf("connect(-1, {sa_family=AF_BLUETOOTH, hci_dev=htobs(%hu)"
|
|
|
8f7639 |
- ", hci_channel=HCI_CHANNEL_RAW}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
+# ifdef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
+ ", hci_channel=HCI_CHANNEL_RAW"
|
|
|
8f7639 |
+# endif
|
|
|
8f7639 |
+ "}, %u) = %d EBADF (%m)\n",
|
|
|
8f7639 |
h_port, len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
@@ -700,9 +711,8 @@
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
|
|
|
8f7639 |
u.sa->sa_family = AF_BLUETOOTH;
|
|
|
8f7639 |
- ++len;
|
|
|
8f7639 |
ret = connect(-1, (void *) u.st, len);
|
|
|
8f7639 |
- printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"00\"}, %u)"
|
|
|
8f7639 |
+ printf("connect(-1, {sa_family=AF_BLUETOOTH, sa_data=\"0\"}, %u)"
|
|
|
8f7639 |
" = %d EBADF (%m)\n", len, ret);
|
|
|
8f7639 |
}
|
|
|
8f7639 |
|
|
|
8f7639 |
Index: strace-5.1/configure
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/configure 2019-08-30 17:41:22.748513960 +0200
|
|
|
8f7639 |
+++ strace-5.1/configure 2019-08-30 17:41:43.118251704 +0200
|
|
|
8f7639 |
@@ -12037,6 +12037,18 @@
|
|
|
8f7639 |
#define HAVE_BLUETOOTH_BLUETOOTH_H 1
|
|
|
8f7639 |
_ACEOF
|
|
|
8f7639 |
|
|
|
8f7639 |
+ ac_fn_c_check_member "$LINENO" "struct sockaddr_hci" "hci_channel" "ac_cv_member_struct_sockaddr_hci_hci_channel" "#include <bluetooth/bluetooth.h>
|
|
|
8f7639 |
+ #include <bluetooth/hci.h>
|
|
|
8f7639 |
+"
|
|
|
8f7639 |
+if test "x$ac_cv_member_struct_sockaddr_hci_hci_channel" = xyes; then :
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+cat >>confdefs.h <<_ACEOF
|
|
|
8f7639 |
+#define HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL 1
|
|
|
8f7639 |
+_ACEOF
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+
|
|
|
8f7639 |
+fi
|
|
|
8f7639 |
+
|
|
|
8f7639 |
ac_fn_c_check_member "$LINENO" "struct sockaddr_l2" "l2_bdaddr_type" "ac_cv_member_struct_sockaddr_l2_l2_bdaddr_type" "#include <bluetooth/bluetooth.h>
|
|
|
8f7639 |
#include <bluetooth/l2cap.h>
|
|
|
8f7639 |
"
|
|
|
8f7639 |
Index: strace-5.1/config.h.in
|
|
|
8f7639 |
===================================================================
|
|
|
8f7639 |
--- strace-5.1.orig/config.h.in 2019-05-22 15:08:39.000000000 +0200
|
|
|
8f7639 |
+++ strace-5.1/config.h.in 2019-08-30 18:32:25.431500194 +0200
|
|
|
8f7639 |
@@ -1391,6 +1391,9 @@
|
|
|
8f7639 |
/* Define to 1 if the system has the type `struct sigcontext'. */
|
|
|
8f7639 |
#undef HAVE_STRUCT_SIGCONTEXT
|
|
|
8f7639 |
|
|
|
8f7639 |
+/* Define to 1 if `hci_channel' is a member of `struct sockaddr_hci'. */
|
|
|
8f7639 |
+#undef HAVE_STRUCT_SOCKADDR_HCI_HCI_CHANNEL
|
|
|
8f7639 |
+
|
|
|
8f7639 |
/* Define to 1 if `l2_bdaddr_type' is a member of `struct sockaddr_l2'. */
|
|
|
8f7639 |
#undef HAVE_STRUCT_SOCKADDR_L2_L2_BDADDR_TYPE
|
|
|
8f7639 |
|