X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Fheaders%2Fx86-64-syscalls-3.10.0-rc7_pointers_override.h;h=f656b3a62e769cb96c213e154330cf5a61586c79;hb=57ede728166a5a18a8cd9e70cb51e09d948f84a4;hp=8aa2abcb4694a01e1048da7b07a08c5a2e481716;hpb=af4a64e7e17c4a65957fc20c33eadec46253d853;p=lttng-modules.git

diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
index 8aa2abcb..f656b3a6 100644
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
@@ -1,12 +1,118 @@
 #ifndef CREATE_SYSCALL_TABLE
 
+#define OVERRIDE_64_connect
+SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
+	TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
+	TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
+	TP_locvar(
+		__typeof__(uservaddr->sa_family) sa_family;
+		uint16_t dport;
+		uint32_t v4addr;
+		uint16_t v6addr[8];
+		int v4addr_len, v6addr_len;
+	),
+	TP_code(
+		sc_in(
+			memset(tp_locvar, 0, sizeof(*tp_locvar));
+			if (addrlen < sizeof(struct sockaddr))
+				goto skip_code;
+			(void) get_user(tp_locvar->sa_family, &uservaddr->sa_family);
+			switch (tp_locvar->sa_family) {
+			case AF_INET:
+				if (addrlen < sizeof(struct sockaddr_in))
+					goto skip_code;
+				(void) get_user(tp_locvar->dport, &((struct sockaddr_in *) uservaddr)->sin_port);
+				(void) get_user(tp_locvar->v4addr, &((struct sockaddr_in *) uservaddr)->sin_addr.s_addr);
+				tp_locvar->v4addr_len = 4;
+				break;
+			case AF_INET6:
+				if (addrlen < sizeof(struct sockaddr_in6))
+					goto skip_code;
+				(void) get_user(tp_locvar->dport, &((struct sockaddr_in6 *) uservaddr)->sin6_port);
+				if (copy_from_user(tp_locvar->v6addr,
+						&((struct sockaddr_in6 *) uservaddr)->sin6_addr.in6_u.u6_addr8,
+						sizeof(tp_locvar->v6addr)))
+					memset(tp_locvar->v6addr, 0, sizeof(tp_locvar->v6addr));
+				tp_locvar->v6addr_len = 8;
+				break;
+			}
+		skip_code:
+		)
+	),
+	TP_FIELDS(
+		sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer_hex(struct sockaddr *, uservaddr, uservaddr))
+		sc_in(ctf_integer_hex(int, addrlen, addrlen))
+		sc_in(ctf_integer(int, family, tp_locvar->sa_family))
+		sc_in(ctf_integer_network(uint16_t, dport, tp_locvar->dport))
+		sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len))
+		sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len))
+	)
+)
+
+#define OVERRIDE_64_accept
+SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
+	TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
+	TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
+	TP_locvar(
+		__typeof__(upeer_sockaddr->sa_family) sa_family;
+		uint16_t sport;
+		uint32_t v4addr;
+		uint16_t v6addr[8];
+		int v4addr_len, v6addr_len;
+		int uaddr_len;
+	),
+	TP_code(
+		sc_inout(
+			memset(tp_locvar, 0, sizeof(*tp_locvar));
+			(void) get_user(tp_locvar->uaddr_len, upeer_addrlen);
+		)
+		sc_out(
+			if (tp_locvar->uaddr_len < sizeof(struct sockaddr))
+				goto skip_code;
+			(void) get_user(tp_locvar->sa_family, &upeer_sockaddr->sa_family);
+			switch (tp_locvar->sa_family) {
+			case AF_INET:
+				if (tp_locvar->uaddr_len < sizeof(struct sockaddr_in))
+					goto skip_code;
+				(void) get_user(tp_locvar->sport, &((struct sockaddr_in *) upeer_sockaddr)->sin_port);
+				(void) get_user(tp_locvar->v4addr, &((struct sockaddr_in *) upeer_sockaddr)->sin_addr.s_addr);
+				tp_locvar->v4addr_len = 4;
+				break;
+			case AF_INET6:
+				if (tp_locvar->uaddr_len < sizeof(struct sockaddr_in6))
+					goto skip_code;
+				(void) get_user(tp_locvar->sport, &((struct sockaddr_in6 *) upeer_sockaddr)->sin6_port);
+				if (copy_from_user(tp_locvar->v6addr,
+						&((struct sockaddr_in6 *) upeer_sockaddr)->sin6_addr.in6_u.u6_addr8,
+						sizeof(tp_locvar->v6addr)))
+					memset(tp_locvar->v6addr, 0, sizeof(tp_locvar->v6addr));
+				tp_locvar->v6addr_len = 8;
+				break;
+			}
+		skip_code:
+		)
+	),
+	TP_FIELDS(
+		sc_exit(ctf_integer(long, ret, ret))
+		sc_in(ctf_integer(int, fd, fd))
+		sc_in(ctf_integer_hex(struct sockaddr *, upeer_sockaddr, upeer_sockaddr))
+		sc_inout(ctf_integer(int, upeer_addrlen, tp_locvar->uaddr_len))
+		sc_out(ctf_integer(int, family, tp_locvar->sa_family))
+		sc_out(ctf_integer_network(uint16_t, sport, tp_locvar->sport))
+		sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, int, tp_locvar->v4addr_len))
+		sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, int, tp_locvar->v6addr_len))
+	)
+)
+
 #else	/* CREATE_SYSCALL_TABLE */
 
-#define OVERRIDE_TABLE_64_sys_clone
-TRACE_SYSCALL_TABLE(sys_clone, sys_clone, 56, 5)
-#define OVERRIDE_TABLE_64_sys_execve
-TRACE_SYSCALL_TABLE(sys_execve, sys_execve, 59, 3)
-#define OVERRIDE_TABLE_64_sys_getcpu
-TRACE_SYSCALL_TABLE(sys_getcpu, sys_getcpu, 309, 3)
+#define OVERRIDE_TABLE_64_clone
+TRACE_SYSCALL_TABLE(clone, clone, 56, 5)
+#define OVERRIDE_TABLE_64_execve
+TRACE_SYSCALL_TABLE(execve, execve, 59, 3)
+#define OVERRIDE_TABLE_64_getcpu
+TRACE_SYSCALL_TABLE(getcpu, getcpu, 309, 3)
 
 #endif /* CREATE_SYSCALL_TABLE */