X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=instrumentation%2Fsyscalls%2Fheaders%2Fx86-64-syscalls-3.10.0-rc7_pointers_override.h;h=6c59790a58e296d8cce5f2cad36ce4a76d77841e;hb=2a837c70c330ee1418c388f6457305280d1b88c7;hp=702cfb5d710b835896f86ffc5482d998896e69b8;hpb=5539ecc8f6ab0a597e5125ff6a16d1a39017417f;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 702cfb5d..6c59790a 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
@@ -11,7 +11,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
 		uint16_t v6addr[8];
 		unsigned int v4addr_len, v6addr_len;
 	),
-	TP_code(
+	TP_code_pre(
 		sc_in(
 			memset(tp_locvar, 0, sizeof(*tp_locvar));
 			if (addrlen < sizeof(struct sockaddr))
@@ -48,7 +48,8 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
 		sc_in(ctf_integer_network(uint16_t, dport, tp_locvar->dport))
 		sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
 		sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
-	)
+	),
+	TP_code_post()
 )
 
 #define OVERRIDE_64_accept
@@ -63,7 +64,7 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
 		int v4addr_len, v6addr_len;
 		int uaddr_len;
 	),
-	TP_code(
+	TP_code_pre(
 		sc_inout(
 			memset(tp_locvar, 0, sizeof(*tp_locvar));
 			(void) get_user(tp_locvar->uaddr_len, upeer_addrlen);
@@ -101,9 +102,67 @@ SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
 		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, unsigned int, tp_locvar->v4addr_len))
-		sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
-	)
+		sc_out(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+		sc_out(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+	),
+	TP_code_post()
+)
+
+#define OVERRIDE_64_accept4
+SC_LTTNG_TRACEPOINT_EVENT_CODE(accept4,
+	TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
+	TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
+	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_pre(
+		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_in(ctf_integer_hex(int, flags, flags))
+		sc_out(ctf_integer(int, family, tp_locvar->sa_family))
+		sc_out(ctf_integer_network(uint16_t, sport, tp_locvar->sport))
+		sc_out(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+		sc_out(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+	),
+	TP_code_post()
 )
 
 #define OVERRIDE_64_pipe