X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=io.c;h=a785711d90ff9fb4c3a5673ca7cd26229e42d265;hb=7fa3d78319b20a996923f9b665afc3a3571ed08b;hp=3bb779885a867919e2ce417c137ca6fc98ced446;hpb=38ae88d332acd9f86a30d58158e306d795d98977;p=strace

diff --git a/io.c b/io.c
index 3bb77988..a785711d 100644
--- a/io.c
+++ b/io.c
@@ -26,317 +26,299 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
  */
 
 #include "defs.h"
-
 #include <fcntl.h>
-#if HAVE_SYS_UIO_H
 #include <sys/uio.h>
-#endif
-
-#ifdef HAVE_LONG_LONG_OFF_T
-/*
- * Hacks for systems that have a long long off_t
- */
 
-#define sys_pread64	sys_pread
-#define sys_pwrite64	sys_pwrite
-#endif
-
-int
-sys_read(tcp)
-struct tcb *tcp;
+SYS_FUNC(read)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
 		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
+			printaddr(tcp->u_arg[1]);
 		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		tprintf(", %lu", tcp->u_arg[2]);
+			printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
+		tprintf(", %" PRI_kru, tcp->u_arg[2]);
 	}
 	return 0;
 }
 
-int
-sys_write(tcp)
-struct tcb *tcp;
+SYS_FUNC(write)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu", tcp->u_arg[2]);
-	}
-	return 0;
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+	tprintf(", %" PRI_kru, tcp->u_arg[2]);
+
+	return RVAL_DECODED;
 }
 
-#if HAVE_SYS_UIO_H
-void
-tprint_iov(tcp, len, addr)
-struct tcb * tcp;
-int len;
-long addr;
-{
-	struct iovec *iov;
-	int i;
+struct print_iovec_config {
+	enum iov_decode decode_iov;
+	kernel_ulong_t data_size;
+};
 
+static bool
+print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
+{
+	const kernel_ulong_t *iov;
+	kernel_ulong_t iov_buf[2], len;
+	struct print_iovec_config *c = data;
 
-	if (!len) {
-		tprintf("[]");
-		return;
-	}
-	  
-	if ((iov = (struct iovec *) malloc(len * sizeof *iov)) == NULL) {
-		fprintf(stderr, "No memory");
-		return;
-	}
-	if (umoven(tcp, addr,
-		   len * sizeof *iov, (char *) iov) < 0) {
-		tprintf("%#lx", tcp->u_arg[1]);
+        if (elem_size < sizeof(iov_buf)) {
+		iov_buf[0] = ((unsigned int *) elem_buf)[0];
+		iov_buf[1] = ((unsigned int *) elem_buf)[1];
+		iov = iov_buf;
 	} else {
-		tprintf("[");
-		for (i = 0; i < len; i++) {
-			if (i)
-				tprintf(", ");
-			tprintf("{");
-			printstr(tcp, (long) iov[i].iov_base,
-				iov[i].iov_len);
-			tprintf(", %lu}", (unsigned long)iov[i].iov_len);
-		}
-		tprintf("]");
+		iov = elem_buf;
+	}
+
+	tprints("{iov_base=");
+
+	len = iov[1];
+
+	switch (c->decode_iov) {
+		case IOV_DECODE_STR:
+			if (len > c->data_size)
+				len = c->data_size;
+			if (c->data_size != (kernel_ulong_t) -1)
+				c->data_size -= len;
+			printstrn(tcp, iov[0], len);
+			break;
+		case IOV_DECODE_NETLINK:
+			if (len > c->data_size)
+				len = c->data_size;
+			if (c->data_size != (kernel_ulong_t) -1)
+				c->data_size -= len;
+			decode_netlink(tcp, iov[0], iov[1]);
+			break;
+		default:
+			printaddr(iov[0]);
+			break;
 	}
-	free((char *) iov);
+
+	tprintf(", iov_len=%" PRI_kru "}", iov[1]);
+
+	return true;
 }
 
-int
-sys_readv(tcp)
-struct tcb *tcp;
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
+void
+tprint_iov_upto(struct tcb *const tcp, const kernel_ulong_t len,
+		const kernel_ulong_t addr, const enum iov_decode decode_iov,
+		const kernel_ulong_t data_size)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-	} else {
-		if (syserror(tcp)) {
-			tprintf("%#lx, %lu",
-					tcp->u_arg[1], tcp->u_arg[2]);
-			return 0;
-		}
-		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-		tprintf(", %lu", tcp->u_arg[2]);
-	}
-	return 0;
+	kernel_ulong_t iov[2];
+	struct print_iovec_config config =
+		{ .decode_iov = decode_iov, .data_size = data_size };
+
+	print_array(tcp, addr, len, iov, current_wordsize * 2,
+		    umoven_or_printaddr_ignore_syserror, print_iovec, &config);
 }
 
-int
-sys_writev(tcp)
-struct tcb *tcp;
+SYS_FUNC(readv)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-		tprintf(", %lu", tcp->u_arg[2]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+	} else {
+		tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
+				syserror(tcp) ? IOV_DECODE_ADDR :
+				IOV_DECODE_STR, tcp->u_rval);
+		tprintf(", %" PRI_kru, tcp->u_arg[2]);
 	}
 	return 0;
 }
-#endif
 
-#if defined(SVR4)
+SYS_FUNC(writev)
+{
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
+	tprintf(", %" PRI_kru, tcp->u_arg[2]);
+
+	return RVAL_DECODED;
+}
 
-int
-sys_pread(tcp)
-struct tcb *tcp;
+SYS_FUNC(pread)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
 		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
+			printaddr(tcp->u_arg[1]);
 		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-#if UNIXWARE
-		/* off_t is signed int */
-		tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
-#else
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-				(((unsigned long long) tcp->u_arg[4]) << 32
-				 | (unsigned) tcp->u_arg[3]));
-#endif
+			printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
+		tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
+		printllval(tcp, "%lld", 3);
 	}
 	return 0;
 }
 
-int
-sys_pwrite(tcp)
-struct tcb *tcp;
+SYS_FUNC(pwrite)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-#if UNIXWARE
-		/* off_t is signed int */
-		tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
-#else
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-				(((unsigned long long) tcp->u_arg[4]) << 32
-				 | (unsigned) tcp->u_arg[3]));
-#endif
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+	tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
+	printllval(tcp, "%lld", 3);
+
+	return RVAL_DECODED;
+}
+
+static void
+print_lld_from_low_high_val(struct tcb *tcp, int arg)
+{
+#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
+# ifndef current_klongsize
+	if (current_klongsize < SIZEOF_LONG) {
+		tprintf("%" PRI_krd, (tcp->u_arg[arg + 1] << current_wordsize * 8)
+			       | tcp->u_arg[arg]);
+	} else
+# endif /* !current_klongsize */
+	{
+		tprintf("%" PRI_krd, tcp->u_arg[arg]);
 	}
-	return 0;
+#elif SIZEOF_LONG > 4
+# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
+#elif HAVE_STRUCT_TCB_EXT_ARG
+# ifndef current_klongsize
+	if (current_klongsize < SIZEOF_LONG_LONG) {
+		tprintf("%lld",
+			(zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+			| zero_extend_signed_to_ull(tcp->u_arg[arg]));
+	} else
+# endif /* !current_klongsize */
+	{
+		tprintf("%lld", tcp->ext_arg[arg]);
+	}
+#else /* SIZEOF_LONG_LONG > SIZEOF_LONG && !HAVE_STRUCT_TCB_EXT_ARG */
+	tprintf("%lld",
+		(zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+		| zero_extend_signed_to_ull(tcp->u_arg[arg]));
+#endif
 }
-#endif /* SVR4 */
 
-#ifdef FREEBSD
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "xlat/rwf_flags.h"
 
-int
-sys_sendfile(tcp)
-struct tcb *tcp;
+static int
+do_preadv(struct tcb *tcp, const int flags_arg)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %ld, %llu, %lu", tcp->u_arg[0], tcp->u_arg[1],
-			(((unsigned long long) tcp->u_arg[3]) << 32 |
-			 (unsigned) tcp->u_arg[2]), tcp->u_arg[4]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
-		off_t offset;
-
-		if (!tcp->u_arg[5])
-			tprintf(", NULL");
-		else {
-			struct sf_hdtr hdtr;
-
-			if (umove(tcp, tcp->u_arg[5], &hdtr) < 0)
-				tprintf(", %#lx", tcp->u_arg[5]);
-			else {
-				tprintf(", { ");
-				tprint_iov(tcp, hdtr.hdr_cnt, hdtr.headers);
-				tprintf(", %u, ", hdtr.hdr_cnt);
-				tprint_iov(tcp, hdtr.trl_cnt, hdtr.trailers);
-				tprintf(", %u }", hdtr.hdr_cnt);
-			}
+		unsigned long len = widen_to_ulong(tcp->u_arg[2]);
+
+		tprint_iov_upto(tcp, len, tcp->u_arg[1],
+				syserror(tcp) ? IOV_DECODE_ADDR :
+				IOV_DECODE_STR, tcp->u_rval);
+		tprintf(", %lu, ", len);
+		print_lld_from_low_high_val(tcp, 3);
+		if (flags_arg >= 0) {
+			tprints(", ");
+			printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
 		}
-		if (!tcp->u_arg[6])
-			tprintf(", NULL");
-		else if (umove(tcp, tcp->u_arg[6], &offset) < 0)
-			tprintf(", %#lx", tcp->u_arg[6]);
-		else
-			tprintf(", [%llu]", offset);
-		tprintf(", %lu", tcp->u_arg[7]);
 	}
 	return 0;
 }
-#endif /* FREEBSD */
 
-#ifdef LINUX
-int
-sys_pread(tcp)
-struct tcb *tcp;
+SYS_FUNC(preadv)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-	} else {
-		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
-		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[3]);
-	}
-	return 0;
+	return do_preadv(tcp, -1);
 }
 
-int
-sys_pwrite(tcp)
-struct tcb *tcp;
+SYS_FUNC(preadv2)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[3]);
-	}
-	return 0;
+	return do_preadv(tcp, 5);
 }
 
-int
-sys_sendfile(tcp)
-struct tcb *tcp;
+static int
+do_pwritev(struct tcb *tcp, const int flags_arg)
 {
-	if (entering(tcp)) {
-		off_t offset;
+	unsigned long len = widen_to_ulong(tcp->u_arg[2]);
 
-		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-		if (!tcp->u_arg[2])
-			tprintf("NULL");
-		else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
-			tprintf("%#lx", tcp->u_arg[2]);
-		else
-			tprintf("[%lu]", offset);
-		tprintf(", %lu", tcp->u_arg[3]);
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	tprint_iov(tcp, len, tcp->u_arg[1], IOV_DECODE_STR);
+	tprintf(", %lu, ", len);
+	print_lld_from_low_high_val(tcp, 3);
+	if (flags_arg >= 0) {
+		tprints(", ");
+		printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
 	}
-	return 0;
+
+	return RVAL_DECODED;
 }
 
-#endif /* LINUX */
+SYS_FUNC(pwritev)
+{
+	return do_pwritev(tcp, -1);
+}
 
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
-int
-sys_pread64(tcp)
-struct tcb *tcp;
+SYS_FUNC(pwritev2)
 {
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-	} else {
-		ALIGN64 (tcp, 3);
-		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
-		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-	}
-	return 0;
+	return do_pwritev(tcp, 5);
 }
 
-int
-sys_pwrite64(tcp)
-struct tcb *tcp;
+#include "xlat/splice_flags.h"
+
+SYS_FUNC(tee)
 {
-	if (entering(tcp)) {
-		ALIGN64 (tcp, 3);
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-	}
-	return 0;
+	/* int fd_in */
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	/* int fd_out */
+	printfd(tcp, tcp->u_arg[1]);
+	tprints(", ");
+	/* size_t len */
+	tprintf("%" PRI_kru ", ", tcp->u_arg[2]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+
+	return RVAL_DECODED;
 }
-#endif
- 
-int
-sys_ioctl(tcp)
-struct tcb *tcp;
+
+SYS_FUNC(splice)
 {
-	char *symbol;
+	/* int fd_in */
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	/* loff_t *off_in */
+	printnum_int64(tcp, tcp->u_arg[1], "%" PRId64);
+	tprints(", ");
+	/* int fd_out */
+	printfd(tcp, tcp->u_arg[2]);
+	tprints(", ");
+	/* loff_t *off_out */
+	printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
+	tprints(", ");
+	/* size_t len */
+	tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
 
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		symbol = ioctl_lookup(tcp->u_arg[1]);
-		if (symbol)
-			tprintf("%s", symbol);
-		else
-			tprintf("%#lx", tcp->u_arg[1]);
-		ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-	}
-	else {
-		int ret;
-		if (!(ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2])))
-			tprintf(", %#lx", tcp->u_arg[2]);
-		else
-			return ret - 1;
-	}
-	return 0;
+	return RVAL_DECODED;
+}
+
+SYS_FUNC(vmsplice)
+{
+	/* int fd */
+	printfd(tcp, tcp->u_arg[0]);
+	tprints(", ");
+	/* const struct iovec *iov, unsigned long nr_segs */
+	tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
+	tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
+	/* unsigned int flags */
+	printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+
+	return RVAL_DECODED;
 }