From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 23 Dec 2016 10:50:10 +0000 (+0000)
Subject: net: change address argument type from long to kernel_ureg_t
X-Git-Tag: v4.16~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=405279fa77403f605e243959a79a735ff1cc1e7e;p=strace

net: change address argument type from long to kernel_ureg_t

* net.c (decode_sockbuf, decode_pair_fd, print_linger, print_ucred,
print_tpacket_stats, print_icmp_filter, print_getsockopt, print_mreq,
print_mreq6, print_group_req, print_tpacket_req, print_packet_mreq,
print_setsockopt): Change address argument type from long
to kernel_ureg_t.
---

diff --git a/net.c b/net.c
index b265b0c2..57788b43 100644
--- a/net.c
+++ b/net.c
@@ -104,7 +104,8 @@ print_ifindex(unsigned int ifindex)
 }
 
 static void
-decode_sockbuf(struct tcb *tcp, int fd, long addr, long addrlen)
+decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ureg_t addr,
+	       const long addrlen)
 {
 
 	switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
@@ -373,7 +374,7 @@ printpair_fd(struct tcb *tcp, const int i0, const int i1)
 }
 
 static void
-decode_pair_fd(struct tcb *tcp, const long addr)
+decode_pair_fd(struct tcb *const tcp, const kernel_ureg_t addr)
 {
 	int pair[2];
 
@@ -486,7 +487,7 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 }
 
 static void
-print_linger(struct tcb *tcp, long addr, int len)
+print_linger(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
 	struct linger linger;
 
@@ -503,7 +504,7 @@ print_linger(struct tcb *tcp, long addr, int len)
 
 #ifdef SO_PEERCRED
 static void
-print_ucred(struct tcb *tcp, long addr, int len)
+print_ucred(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
 	struct ucred uc;
 
@@ -521,7 +522,8 @@ print_ucred(struct tcb *tcp, long addr, int len)
 
 #ifdef PACKET_STATISTICS
 static void
-print_tpacket_stats(struct tcb *tcp, long addr, int len)
+print_tpacket_stats(struct tcb *const tcp, const kernel_ureg_t addr,
+		    const int len)
 {
 	struct tpacket_stats stats;
 
@@ -539,7 +541,7 @@ print_tpacket_stats(struct tcb *tcp, long addr, int len)
 #include "xlat/icmpfilterflags.h"
 
 static void
-print_icmp_filter(struct tcb *tcp, const long addr, int len)
+print_icmp_filter(struct tcb *const tcp, const kernel_ureg_t addr, int len)
 {
 	struct icmp_filter filter = {};
 
@@ -559,8 +561,9 @@ print_icmp_filter(struct tcb *tcp, const long addr, int len)
 }
 
 static void
-print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
-		 long addr, int len)
+print_getsockopt(struct tcb *const tcp, const unsigned int level,
+		 const unsigned int name, const kernel_ureg_t addr,
+		 const int len)
 {
 	if (addr && verbose(tcp))
 	switch (level) {
@@ -633,7 +636,8 @@ SYS_FUNC(getsockopt)
 
 #ifdef IP_ADD_MEMBERSHIP
 static void
-print_mreq(struct tcb *tcp, long addr, unsigned int len)
+print_mreq(struct tcb *const tcp, const kernel_ureg_t addr,
+	   const unsigned int len)
 {
 	struct ip_mreq mreq;
 
@@ -656,7 +660,8 @@ print_mreq(struct tcb *tcp, long addr, unsigned int len)
 
 #ifdef IPV6_ADD_MEMBERSHIP
 static void
-print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+print_mreq6(struct tcb *const tcp, const kernel_ureg_t addr,
+	    const unsigned int len)
 {
 	struct ipv6_mreq mreq;
 
@@ -686,7 +691,7 @@ fail:
 
 #ifdef MCAST_JOIN_GROUP
 static void
-print_group_req(struct tcb *tcp, long addr, int len)
+print_group_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
 	struct group_req greq;
 
@@ -705,7 +710,7 @@ print_group_req(struct tcb *tcp, long addr, int len)
 
 #ifdef PACKET_RX_RING
 static void
-print_tpacket_req(struct tcb *tcp, long addr, int len)
+print_tpacket_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
 	struct tpacket_req req;
 
@@ -727,7 +732,7 @@ print_tpacket_req(struct tcb *tcp, long addr, int len)
 # include "xlat/packet_mreq_type.h"
 
 static void
-print_packet_mreq(struct tcb *tcp, long addr, int len)
+print_packet_mreq(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
 	struct packet_mreq mreq;
 
@@ -750,8 +755,9 @@ print_packet_mreq(struct tcb *tcp, long addr, int len)
 #endif /* PACKET_ADD_MEMBERSHIP */
 
 static void
-print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
-		 long addr, int len)
+print_setsockopt(struct tcb *const tcp, const unsigned int level,
+		 const unsigned int name, const kernel_ureg_t addr,
+		 const int len)
 {
 	if (addr && verbose(tcp))
 	switch (level) {