summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Talbert <ptalbert@redhat.com>2019-05-17 11:11:28 -0400
committerDavid S. Miller <davem@davemloft.net>2019-05-19 13:31:10 -0400
commitea9a03791a73e853897eda93e139018ca38f3c94 (patch)
tree476ac5b8a6585480fcac43801f706ed35a2abc4d
parentc50a42b8f61f3492a0d3a1c7fb4932e19cf3e626 (diff)
net: Treat sock->sk_drops as an unsigned int when printing
Currently, procfs socket stats format sk_drops as a signed int (%d). For large values this will cause a negative number to be printed. We know the drop count can never be a negative so change the format specifier to %u. Signed-off-by: Patrick Talbert <ptalbert@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ping.c2
-rw-r--r--net/ipv4/raw.c2
-rw-r--r--net/ipv4/udp.c2
-rw-r--r--net/ipv6/datagram.c2
-rw-r--r--net/netlink/af_netlink.c2
-rw-r--r--net/phonet/socket.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 7ccb5f87f70b..834be7daeb32 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -1113,7 +1113,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
1113 __u16 srcp = ntohs(inet->inet_sport); 1113 __u16 srcp = ntohs(inet->inet_sport);
1114 1114
1115 seq_printf(f, "%5d: %08X:%04X %08X:%04X" 1115 seq_printf(f, "%5d: %08X:%04X %08X:%04X"
1116 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d", 1116 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u",
1117 bucket, src, srcp, dest, destp, sp->sk_state, 1117 bucket, src, srcp, dest, destp, sp->sk_state,
1118 sk_wmem_alloc_get(sp), 1118 sk_wmem_alloc_get(sp),
1119 sk_rmem_alloc_get(sp), 1119 sk_rmem_alloc_get(sp),
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index dc91c27bb788..0e482f07b37f 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -1076,7 +1076,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
1076 srcp = inet->inet_num; 1076 srcp = inet->inet_num;
1077 1077
1078 seq_printf(seq, "%4d: %08X:%04X %08X:%04X" 1078 seq_printf(seq, "%4d: %08X:%04X %08X:%04X"
1079 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n", 1079 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u\n",
1080 i, src, srcp, dest, destp, sp->sk_state, 1080 i, src, srcp, dest, destp, sp->sk_state,
1081 sk_wmem_alloc_get(sp), 1081 sk_wmem_alloc_get(sp),
1082 sk_rmem_alloc_get(sp), 1082 sk_rmem_alloc_get(sp),
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 3c58ba02af7d..8fb250ed53d4 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2883,7 +2883,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
2883 __u16 srcp = ntohs(inet->inet_sport); 2883 __u16 srcp = ntohs(inet->inet_sport);
2884 2884
2885 seq_printf(f, "%5d: %08X:%04X %08X:%04X" 2885 seq_printf(f, "%5d: %08X:%04X %08X:%04X"
2886 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d", 2886 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u",
2887 bucket, src, srcp, dest, destp, sp->sk_state, 2887 bucket, src, srcp, dest, destp, sp->sk_state,
2888 sk_wmem_alloc_get(sp), 2888 sk_wmem_alloc_get(sp),
2889 udp_rqueue_get(sp), 2889 udp_rqueue_get(sp),
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index ee4a4e54d016..f07fb24f4ba1 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -1034,7 +1034,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
1034 src = &sp->sk_v6_rcv_saddr; 1034 src = &sp->sk_v6_rcv_saddr;
1035 seq_printf(seq, 1035 seq_printf(seq,
1036 "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " 1036 "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
1037 "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n", 1037 "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u\n",
1038 bucket, 1038 bucket,
1039 src->s6_addr32[0], src->s6_addr32[1], 1039 src->s6_addr32[0], src->s6_addr32[1],
1040 src->s6_addr32[2], src->s6_addr32[3], srcp, 1040 src->s6_addr32[2], src->s6_addr32[3], srcp,
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 216ab915dd54..718a97d5f1fd 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2642,7 +2642,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
2642 struct sock *s = v; 2642 struct sock *s = v;
2643 struct netlink_sock *nlk = nlk_sk(s); 2643 struct netlink_sock *nlk = nlk_sk(s);
2644 2644
2645 seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8d %-8lu\n", 2645 seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8lu\n",
2646 s, 2646 s,
2647 s->sk_protocol, 2647 s->sk_protocol,
2648 nlk->portid, 2648 nlk->portid,
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 30187990257f..2567af2fbd6f 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -607,7 +607,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
607 struct pn_sock *pn = pn_sk(sk); 607 struct pn_sock *pn = pn_sk(sk);
608 608
609 seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu " 609 seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu "
610 "%d %pK %d", 610 "%d %pK %u",
611 sk->sk_protocol, pn->sobject, pn->dobject, 611 sk->sk_protocol, pn->sobject, pn->dobject,
612 pn->resource, sk->sk_state, 612 pn->resource, sk->sk_state,
613 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), 613 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),