From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 25 Dec 2016 00:53:52 +0000 (+0000)
Subject: dumpiov_upto: change size types from unsigned long to kernel_ureg_t
X-Git-Tag: v4.16~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0601cf5939831f2924516201503b656cde881e73;p=strace

dumpiov_upto: change size types from unsigned long to kernel_ureg_t

* defs.h (dumpiov_upto): Change data_size argument type
from unsigned long to kernel_ureg_t.
* util.c (dumpiov_upto): Change the type of data_size argument
and iov_len variable from unsigned long to kernel_ureg_t.
---

diff --git a/defs.h b/defs.h
index d8f0d1ba..138afeea 100644
--- a/defs.h
+++ b/defs.h
@@ -607,7 +607,7 @@ extern void
 dumpiov_in_mmsghdr(struct tcb *, kernel_ureg_t addr);
 
 extern void
-dumpiov_upto(struct tcb *, int len, kernel_ureg_t addr, unsigned long data_size);
+dumpiov_upto(struct tcb *, int len, kernel_ureg_t addr, kernel_ureg_t data_size);
 
 extern void
 dumpstr(struct tcb *, kernel_ureg_t addr, int len);
diff --git a/util.c b/util.c
index 72c5251e..10799192 100644
--- a/util.c
+++ b/util.c
@@ -916,7 +916,7 @@ printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr,
 
 void
 dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ureg_t addr,
-	     unsigned long data_size)
+	     kernel_ureg_t data_size)
 {
 #if SUPPORTED_PERSONALITIES > 1
 	union {
@@ -948,7 +948,7 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ureg_t addr,
 	}
 	if (umoven(tcp, addr, size, iov) >= 0) {
 		for (i = 0; i < len; i++) {
-			unsigned long iov_len = iov_iov_len(i);
+			kernel_ureg_t iov_len = iov_iov_len(i);
 			if (iov_len > data_size)
 				iov_len = data_size;
 			if (!iov_len)