Blame SOURCES/0042-sockaddr-properly-decode-sockaddr_hci-addresses-with.patch

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