mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
seq_file: remove "%n" usage from seq_file users
All seq_printf() users are using "%n" for calculating padding size, convert them to use seq_setwidth() / seq_pad() pair. Signed-off-by: Tetsuo Handa <[email protected]> Signed-off-by: Kees Cook <[email protected]> Cc: Joe Perches <[email protected]> Cc: David Miller <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Tetsuo Handa
Linus Torvalds
parent
839cc2a94c
commit
652586df95
10 changed files with 73 additions and 97 deletions
|
|
@ -2523,16 +2523,17 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
|
|||
list_for_each_entry_rcu(fa, &li->falh, fa_list) {
|
||||
const struct fib_info *fi = fa->fa_info;
|
||||
unsigned int flags = fib_flag_trans(fa->fa_type, mask, fi);
|
||||
int len;
|
||||
|
||||
if (fa->fa_type == RTN_BROADCAST
|
||||
|| fa->fa_type == RTN_MULTICAST)
|
||||
continue;
|
||||
|
||||
seq_setwidth(seq, 127);
|
||||
|
||||
if (fi)
|
||||
seq_printf(seq,
|
||||
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
|
||||
"%d\t%08X\t%d\t%u\t%u%n",
|
||||
"%d\t%08X\t%d\t%u\t%u",
|
||||
fi->fib_dev ? fi->fib_dev->name : "*",
|
||||
prefix,
|
||||
fi->fib_nh->nh_gw, flags, 0, 0,
|
||||
|
|
@ -2541,15 +2542,15 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
|
|||
(fi->fib_advmss ?
|
||||
fi->fib_advmss + 40 : 0),
|
||||
fi->fib_window,
|
||||
fi->fib_rtt >> 3, &len);
|
||||
fi->fib_rtt >> 3);
|
||||
else
|
||||
seq_printf(seq,
|
||||
"*\t%08X\t%08X\t%04X\t%d\t%u\t"
|
||||
"%d\t%08X\t%d\t%u\t%u%n",
|
||||
"%d\t%08X\t%d\t%u\t%u",
|
||||
prefix, 0, flags, 0, 0, 0,
|
||||
mask, 0, 0, 0, &len);
|
||||
mask, 0, 0, 0);
|
||||
|
||||
seq_printf(seq, "%*s\n", 127 - len, "");
|
||||
seq_pad(seq, '\n');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1076,7 +1076,7 @@ void ping_seq_stop(struct seq_file *seq, void *v)
|
|||
EXPORT_SYMBOL_GPL(ping_seq_stop);
|
||||
|
||||
static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
|
||||
int bucket, int *len)
|
||||
int bucket)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sp);
|
||||
__be32 dest = inet->inet_daddr;
|
||||
|
|
@ -1085,7 +1085,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
|
|||
__u16 srcp = ntohs(inet->inet_sport);
|
||||
|
||||
seq_printf(f, "%5d: %08X:%04X %08X:%04X"
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d%n",
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",
|
||||
bucket, src, srcp, dest, destp, sp->sk_state,
|
||||
sk_wmem_alloc_get(sp),
|
||||
sk_rmem_alloc_get(sp),
|
||||
|
|
@ -1093,23 +1093,22 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
|
|||
from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
|
||||
0, sock_i_ino(sp),
|
||||
atomic_read(&sp->sk_refcnt), sp,
|
||||
atomic_read(&sp->sk_drops), len);
|
||||
atomic_read(&sp->sk_drops));
|
||||
}
|
||||
|
||||
static int ping_v4_seq_show(struct seq_file *seq, void *v)
|
||||
{
|
||||
seq_setwidth(seq, 127);
|
||||
if (v == SEQ_START_TOKEN)
|
||||
seq_printf(seq, "%-127s\n",
|
||||
" sl local_address rem_address st tx_queue "
|
||||
seq_puts(seq, " sl local_address rem_address st tx_queue "
|
||||
"rx_queue tr tm->when retrnsmt uid timeout "
|
||||
"inode ref pointer drops");
|
||||
else {
|
||||
struct ping_iter_state *state = seq->private;
|
||||
int len;
|
||||
|
||||
ping_v4_format_sock(v, seq, state->bucket, &len);
|
||||
seq_printf(seq, "%*s\n", 127 - len, "");
|
||||
ping_v4_format_sock(v, seq, state->bucket);
|
||||
}
|
||||
seq_pad(seq, '\n');
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2541,13 +2541,13 @@ void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo)
|
|||
EXPORT_SYMBOL(tcp_proc_unregister);
|
||||
|
||||
static void get_openreq4(const struct sock *sk, const struct request_sock *req,
|
||||
struct seq_file *f, int i, kuid_t uid, int *len)
|
||||
struct seq_file *f, int i, kuid_t uid)
|
||||
{
|
||||
const struct inet_request_sock *ireq = inet_rsk(req);
|
||||
long delta = req->expires - jiffies;
|
||||
|
||||
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK%n",
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK",
|
||||
i,
|
||||
ireq->ir_loc_addr,
|
||||
ntohs(inet_sk(sk)->inet_sport),
|
||||
|
|
@ -2562,11 +2562,10 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
|
|||
0, /* non standard timer */
|
||||
0, /* open_requests have no inode */
|
||||
atomic_read(&sk->sk_refcnt),
|
||||
req,
|
||||
len);
|
||||
req);
|
||||
}
|
||||
|
||||
static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
|
||||
static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)
|
||||
{
|
||||
int timer_active;
|
||||
unsigned long timer_expires;
|
||||
|
|
@ -2605,7 +2604,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
|
|||
rx_queue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0);
|
||||
|
||||
seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "
|
||||
"%08X %5u %8d %lu %d %pK %lu %lu %u %u %d%n",
|
||||
"%08X %5u %8d %lu %d %pK %lu %lu %u %u %d",
|
||||
i, src, srcp, dest, destp, sk->sk_state,
|
||||
tp->write_seq - tp->snd_una,
|
||||
rx_queue,
|
||||
|
|
@ -2622,12 +2621,11 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
|
|||
tp->snd_cwnd,
|
||||
sk->sk_state == TCP_LISTEN ?
|
||||
(fastopenq ? fastopenq->max_qlen : 0) :
|
||||
(tcp_in_initial_slowstart(tp) ? -1 : tp->snd_ssthresh),
|
||||
len);
|
||||
(tcp_in_initial_slowstart(tp) ? -1 : tp->snd_ssthresh));
|
||||
}
|
||||
|
||||
static void get_timewait4_sock(const struct inet_timewait_sock *tw,
|
||||
struct seq_file *f, int i, int *len)
|
||||
struct seq_file *f, int i)
|
||||
{
|
||||
__be32 dest, src;
|
||||
__u16 destp, srcp;
|
||||
|
|
@ -2639,10 +2637,10 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
|
|||
srcp = ntohs(tw->tw_sport);
|
||||
|
||||
seq_printf(f, "%4d: %08X:%04X %08X:%04X"
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK",
|
||||
i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
|
||||
3, jiffies_delta_to_clock_t(delta), 0, 0, 0, 0,
|
||||
atomic_read(&tw->tw_refcnt), tw, len);
|
||||
atomic_read(&tw->tw_refcnt), tw);
|
||||
}
|
||||
|
||||
#define TMPSZ 150
|
||||
|
|
@ -2651,11 +2649,10 @@ static int tcp4_seq_show(struct seq_file *seq, void *v)
|
|||
{
|
||||
struct tcp_iter_state *st;
|
||||
struct sock *sk = v;
|
||||
int len;
|
||||
|
||||
seq_setwidth(seq, TMPSZ - 1);
|
||||
if (v == SEQ_START_TOKEN) {
|
||||
seq_printf(seq, "%-*s\n", TMPSZ - 1,
|
||||
" sl local_address rem_address st tx_queue "
|
||||
seq_puts(seq, " sl local_address rem_address st tx_queue "
|
||||
"rx_queue tr tm->when retrnsmt uid timeout "
|
||||
"inode");
|
||||
goto out;
|
||||
|
|
@ -2666,16 +2663,16 @@ static int tcp4_seq_show(struct seq_file *seq, void *v)
|
|||
case TCP_SEQ_STATE_LISTENING:
|
||||
case TCP_SEQ_STATE_ESTABLISHED:
|
||||
if (sk->sk_state == TCP_TIME_WAIT)
|
||||
get_timewait4_sock(v, seq, st->num, &len);
|
||||
get_timewait4_sock(v, seq, st->num);
|
||||
else
|
||||
get_tcp4_sock(v, seq, st->num, &len);
|
||||
get_tcp4_sock(v, seq, st->num);
|
||||
break;
|
||||
case TCP_SEQ_STATE_OPENREQ:
|
||||
get_openreq4(st->syn_wait_sk, v, seq, st->num, st->uid, &len);
|
||||
get_openreq4(st->syn_wait_sk, v, seq, st->num, st->uid);
|
||||
break;
|
||||
}
|
||||
seq_printf(seq, "%*s\n", TMPSZ - 1 - len, "");
|
||||
out:
|
||||
seq_pad(seq, '\n');
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2331,7 +2331,7 @@ EXPORT_SYMBOL(udp_proc_unregister);
|
|||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
static void udp4_format_sock(struct sock *sp, struct seq_file *f,
|
||||
int bucket, int *len)
|
||||
int bucket)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sp);
|
||||
__be32 dest = inet->inet_daddr;
|
||||
|
|
@ -2340,7 +2340,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
|
|||
__u16 srcp = ntohs(inet->inet_sport);
|
||||
|
||||
seq_printf(f, "%5d: %08X:%04X %08X:%04X"
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d%n",
|
||||
" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",
|
||||
bucket, src, srcp, dest, destp, sp->sk_state,
|
||||
sk_wmem_alloc_get(sp),
|
||||
sk_rmem_alloc_get(sp),
|
||||
|
|
@ -2348,23 +2348,22 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
|
|||
from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
|
||||
0, sock_i_ino(sp),
|
||||
atomic_read(&sp->sk_refcnt), sp,
|
||||
atomic_read(&sp->sk_drops), len);
|
||||
atomic_read(&sp->sk_drops));
|
||||
}
|
||||
|
||||
int udp4_seq_show(struct seq_file *seq, void *v)
|
||||
{
|
||||
seq_setwidth(seq, 127);
|
||||
if (v == SEQ_START_TOKEN)
|
||||
seq_printf(seq, "%-127s\n",
|
||||
" sl local_address rem_address st tx_queue "
|
||||
seq_puts(seq, " sl local_address rem_address st tx_queue "
|
||||
"rx_queue tr tm->when retrnsmt uid timeout "
|
||||
"inode ref pointer drops");
|
||||
else {
|
||||
struct udp_iter_state *state = seq->private;
|
||||
int len;
|
||||
|
||||
udp4_format_sock(v, seq, state->bucket, &len);
|
||||
seq_printf(seq, "%*s\n", 127 - len, "");
|
||||
udp4_format_sock(v, seq, state->bucket);
|
||||
}
|
||||
seq_pad(seq, '\n');
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue