net: Replace %pK output with 0
Subsystems (13)
PATCH v4 1/1 net: Replace %pK output with 0
Commit 71338aa7d050c ("net: convert %p usage to %pK") which is from 2011 and changed the %p annotation for pointer to %pK. Back then the default behaviour for %p was to print the pointer. The %pK modifier was introduced to able to control the behaviour of specific pointer values without changing the behaviour of %p for everyone. It was dedicated to avoid leaking pointers via /proc.
There was also the idea to remove the check from formatting the string and move to the open callback with some helpers but this did not happen.
Things changed over time. The default behaviour for %p is now to print a hash pointer which does not leak the address but allows to correlate if two pointers are equal.
The policy on %p is to not introduce new ones. This is somehow in between since it already exists. The pointer are usually socket pointers and I don't see any value in exposing them. Therefore I am following the recommendation of removing them. Since their usage in /proc/ can be considered ABI I replace the pointer with a 0.
Replace the %pK annotation with 0 value. Correct the spacing for the cases where pointer is at the beginning (a few drivers did expect 32bit pointers so things got a bit off with 64bit wide pointers).
---
v3…v4: https://lore.kernel.org/all/[email protected]/
- The CAN changes have been dropped. There will be different change removing the %p coming from the CAN department. There is now no %pS user in this patch but the issue sashiko complained about is in the works…
- Field description updated in Documentation/networking/proc_net_tcp.rst
v2…v3: https://lore.kernel.org/all/[email protected]/
- seq_printf() with static strings have been replaced with seq_puts() (checkpatch)
- Added missing fixed length in the CAN_EFF_FLAG case (can_print_rcvlist(), sashiko)
- Added missing 0 in get_timewait6_sock() (Jakub)
- Added back padding to the unix_seq_show() output. There is a selftest which checks the length of the first line. (kernel test robot <[email protected]>)
v1…v2: https://lore.kernel.org/all/[email protected]
- This follows Kees' feedback regarding the general policy and "is it really needed?". Since I don't think that this is of general usage I replaced them all with 0 and corrected the spacing at the beginning.
- can_print_rcvlist() is now using a %ps to print the name of the function. Everything is a sock pointer (or some other data structure) and is now 0.
net/atm/proc.c | 7 +++---- net/can/bcm.c | 4 +--- net/can/proc.c | 12 ++++-------- net/ipv4/ping.c | 5 ++--- net/ipv4/raw.c | 4 ++-- net/ipv4/tcp_ipv4.c | 13 ++++++------- net/ipv4/udp.c | 5 ++--- net/ipv6/datagram.c | 5 ++--- net/ipv6/tcp_ipv6.c | 12 ++++++------ net/key/af_key.c | 5 ++--- net/netlink/af_netlink.c | 5 ++--- net/packet/af_packet.c | 7 ++----- net/phonet/socket.c | 5 ++--- net/sctp/proc.c | 6 +++--- net/unix/af_unix.c | 3 +-- 15 files changed, 40 insertions(+), 58 deletions(-)
net/atm/proc.c +3 -4
@@ -159,7 +159,7 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc) {struct sock *sk =sk_atm (vcc); -seq_printf (seq,"%pK " , vcc); +seq_puts (seq," 0 " );if (!vcc->dev)seq_printf (seq,"Unassigned " );else
@@ -228,9 +228,8 @@ static const struct seq_operations pvc_seq_ops = {static int vcc_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) { -seq_printf (seq,sizeof (void *) ==4 ?"%-8s%s" :"%-16s%s" , -"Address " ,"Itf VPI VCI Fam Flags Reply " -"Send buffer Recv buffer [refcnt]\n" ); +seq_puts (seq,"Address Itf VPI VCI Fam Flags Reply " +"Send buffer Recv buffer [refcnt]\n" ); }else {struct vcc_state *state = seq->private;struct atm_vcc *vcc =atm_sk (state->sk);
net/can/bcm.c +1 -3
@@ -220,9 +220,7 @@ static int bcm_proc_show(struct seq_file *m, void *v)struct bcm_sock *bo =bcm_sk (sk);struct bcm_op *op; -seq_printf (m,">>> socket %pK" , sk->sk_socket); -seq_printf (m," / sk %pK" , sk); -seq_printf (m," / bo %pK" , bo); +seq_puts (m,">>> socket 0 / sk 0 / bo 0" );seq_printf (m," / dropped %lu" , bo->dropped_usr_msgs);seq_printf (m," / bound %s" ,bcm_proc_getifname (net, ifname, bo->ifindex));seq_printf (m," <<<\n" );
net/can/proc.c +4 -8
@@ -192,12 +192,11 @@ static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list,hlist_for_each_entry_rcu (r, rx_list, list) {char *fmt = (r->can_id &CAN_EFF_FLAG )? -" %-5s %08x %08x %pK %pK %8ld %s\n" : -" %-5s %03x %08x %pK %pK %8ld %s\n" ; +" %-5s %08x %08x %-20ps %8u %8ld %s\n" : +" %-5s %03x %08x %-20ps %8u %8ld %s\n" ;seq_printf (m, fmt,DNAME (dev), r->can_id, r->mask, - r->func, r->data,atomic_long_read (&r->matches), - r->ident); + r->func,0 ,atomic_long_read (&r->matches), r->ident); } }
@@ -207,10 +206,7 @@ static void can_print_recv_banner(struct seq_file *m)* can1. 00000000 00000000 00000000 * ....... 0 tp20 */ -if (IS_ENABLED (CONFIG_64BIT )) -seq_puts (m," device can_id can_mask function userdata matches ident\n" ); -else -seq_puts (m," device can_id can_mask function userdata matches ident\n" ); +seq_puts (m," device can_id can_mask function userdata matches ident\n" ); }static int can_stats_proc_show (struct seq_file *m,void *v)
net/ipv4/ping.c +2 -3
@@ -1095,15 +1095,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int ping_v4_seq_show (struct seq_file *seq,void *v)
net/ipv4/raw.c +2 -2
@@ -1054,14 +1054,14 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) srcp = inet->inet_num;seq_printf (seq,"%4d: %08X:%04X %08X:%04X" -" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n" , i, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp,sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int raw_seq_show (struct seq_file *seq,void *v)
net/ipv4/tcp_ipv4.c +6 -7
@@ -2748,7 +2748,7 @@ static void get_openreq4(const struct request_sock *req,long delta = req->rsk_timer.expires - jiffies; seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d 0", i, ireq->ir_loc_addr, ireq->ir_num,
@@ -2763,8 +2763,7 @@ static void get_openreq4(const struct request_sock *req, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ -0 , - req); + 0); }static void get_tcp4_sock (struct sock *sk,struct seq_file *f,int i)
@@ -2811,7 +2810,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) READ_ONCE(tp->copied_seq), 0); seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " - "%08X %5u %8d %llu %d %pK %lu %lu %u %u %d", + "%08X %5u %8d %llu %d 0 %lu %lu %u %u %d", i, src, srcp, dest, destp, state, READ_ONCE(tp->write_seq) - tp->snd_una, rx_queue,
@@ -2821,7 +2820,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)from_kuid_munged (seq_user_ns (f),sk_uid (sk)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, +refcount_read (&sk->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sk),
@@ -2844,10 +2843,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" , +" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0" , i, src, srcp, dest, destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , -refcount_read (&tw->tw_refcnt), tw); +refcount_read (&tw->tw_refcnt)); }#define TMPSZ 150
net/ipv4/udp.c +2 -3
@@ -3283,15 +3283,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),udp_rqueue_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int udp4_seq_show (struct seq_file *seq,void *v)
net/ipv6/datagram.c +2 -3
@@ -1102,7 +1102,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, src = &sp->sk_v6_rcv_saddr; seq_printf(seq, "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n", bucket, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -1115,6 +1115,5 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, - sk_drops_read(sp)); + refcount_read(&sp->sk_refcnt), sk_drops_read(sp)); }
net/ipv6/tcp_ipv6.c +6 -6
@@ -2103,7 +2103,7 @@ static void get_openreq6(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3],
@@ -2120,7 +2120,7 @@ static void get_openreq6(struct seq_file *seq, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ - 0, req); + 0); }static void get_tcp6_sock (struct seq_file *seq,struct sock *sp,int i)
@@ -2171,7 +2171,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %lu %lu %u %u %d\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %lu %lu %u %u %d\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -2186,7 +2186,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, +refcount_read (&sp->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sp),
@@ -2211,7 +2211,7 @@ static void get_timewait6_sock(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -2219,7 +2219,7 @@ static void get_timewait6_sock(struct seq_file *seq, dest->s6_addr32[2 ], dest->s6_addr32[3 ], destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , - refcount_read(&tw->tw_refcnt), tw); + refcount_read(&tw->tw_refcnt)); }static int tcp6_seq_show (struct seq_file *seq,void *v)
net/key/af_key.c +2 -3
@@ -3803,10 +3803,9 @@ static int pfkey_seq_show(struct seq_file *f, void *v)struct sock *s =sk_entry (v);if (v ==SEQ_START_TOKEN ) -seq_printf (f ,"sk RefCnt Rmem Wmem User Inode\n" ); +seq_puts (f,"sk RefCnt Rmem Wmem User Inode\n" );else - seq_printf(f, "%pK %-6d %-6u %-6u %-6u %-6llu\n", - s, + seq_printf(f, "0 %-6d %-6u %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s),
net/netlink/af_netlink.c +2 -3
@@ -2700,14 +2700,13 @@ static int netlink_native_seq_show(struct seq_file *seq, void *v) {if (v ==SEQ_START_TOKEN ) {seq_puts (seq, -"sk Eth Pid Groups " +"sk Eth Pid Groups " "Rmem Wmem Dump Locks Drops Inode\n" ); }else {struct sock *s = v;struct netlink_sock *nlk =nlk_sk (s); - seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", - s, + seq_printf(seq, "0 %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", s->sk_protocol, nlk->portid, nlk->groups ? (u32)nlk->groups[0] : 0,
net/packet/af_packet.c +2 -5
@@ -4744,16 +4744,13 @@ static void packet_seq_stop(struct seq_file *seq, void *v)static int packet_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) -seq_printf (seq, -"%*sRefCnt Type Proto Iface R Rmem User Inode\n" , -IS_ENABLED (CONFIG_64BIT ) ?-17 :-9 ,"sk" ); +seq_puts (seq,"sk RefCnt Type Proto Iface R Rmem User Inode\n" );else {struct sock *s =sk_entry (v);const struct packet_sock *po =pkt_sk (s); seq_printf(seq, - "%pK %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", - s, + "0 %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), s->sk_type, ntohs(READ_ONCE(po->num)),
net/phonet/socket.c +2 -3
@@ -586,14 +586,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)struct pn_sock *pn =pn_sk (sk);seq_printf (seq,"%2d %04X:%04X:%02X %02X %08X:%08X %5d %llu " -"%d %pK %u" , +"%d 0 %u" , sk->sk_protocol, pn->sobject, pn->dobject, pn->resource, sk->sk_state,sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk),from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, -sk_drops_read (sk)); +refcount_read (&sk->sk_refcnt),sk_drops_read (sk)); }seq_pad (seq,'\n' );return 0 ;
net/sctp/proc.c +3 -3
@@ -174,7 +174,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) sk = ep->base.sk;if (!net_eq (sock_net (sk),seq_file_net (seq)))continue ; - seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5u %5llu ", ep, sk, + seq_printf(seq, "%8d %8d %-3d %-3d %-4d %-5d %5u %5llu ", 0, 0, sctp_sk(sk)->type, sk->sk_state, hash, ep->base.bind_addr.port, from_kuid_munged(seq_user_ns(seq), sk_uid(sk)),
@@ -260,9 +260,9 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) sk = epb->sk; seq_printf(seq, - "%8pK %8pK %-3d %-3d %-2d %-4d " + "%8d %8d %-3d %-3d %-2d %-4d " "%4d %8d %8d %7u %5llu %-5d %5d ", - assoc, sk, sctp_sk(sk)->type, sk->sk_state, + 0, 0, sctp_sk(sk)->type, sk->sk_state, assoc->state, 0, assoc->assoc_id, assoc->sndbuf_used,
net/unix/af_unix.c +1 -2
@@ -3555,8 +3555,7 @@ static int unix_seq_show(struct seq_file *seq, void *v)struct unix_sock *u =unix_sk (s);unix_state_lock (s); - seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5llu", - s, + seq_printf(seq, "%08u: %08X %08X %08X %04X %02X %5llu", 0, refcount_read(&s->sk_refcnt), 0, s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
Signature · 1 line
2.55.0
Oliver Hartkopp
maintainerQuoted 19 lines · Sebastian Andrzej Siewior
Commit
71338aa7d050c("net: convert %p usage to %pK") which is from 2011 and changed the %p annotation for pointer to %pK. Back then the default behaviour for %p was to print the pointer. The %pK modifier was introduced to able to control the behaviour of specific pointer values without changing the behaviour of %p for everyone. It was dedicated to avoid leaking pointers via /proc.There was also the idea to remove the check from formatting the string and move to the open callback with some helpers but this did not happen.
Things changed over time. The default behaviour for %p is now to print a hash pointer which does not leak the address but allows to correlate if two pointers are equal.
The policy on %p is to not introduce new ones. This is somehow in between since it already exists. The pointer are usually socket pointers and I don't see any value in exposing them. Therefore I am following the recommendation of removing them. Since their usage in/proc/can be considered ABI I replace the pointer with a 0.
Quoted 8 lines
Replace the %pK annotation with 0 value. Correct the spacing for the cases where pointer is at the beginning (a few drivers did expect 32bit pointers so things got a bit off with 64bit wide pointers).
Signed-off-by Sebastian Andrzej Siewior <[email protected]>---
v3…v4: https://lore.kernel.org/all/[email protected]/
- The CAN changes have been dropped.
No. They are still part of your patch - in the former way.
Would you like to integrate my patch into yours or do you want me to rebase my code once it shows up in net-next?
https://lore.kernel.org/linux-can/[email protected]/
Best regards,
Oliver
Quoted 432 lines
There will be different change removing
the %p coming from the CAN department. There is now no %pS user in this patch but the issue sashiko complained about is in the works…
- Field description updated inDocumentation/networking/proc_net_tcp.rstv2…v3: https://lore.kernel.org/all/[email protected]/
-seq_printf()with static strings have been replaced withseq_puts()(checkpatch)
- Added missing fixed length in theCAN_EFF_FLAGcase (can_print_rcvlist(), sashiko)
- Added missing 0 inget_timewait6_sock()(Jakub)
- Added back padding to theunix_seq_show()output. There is a selftest which checks the length of the first line. (kernel test robot <[email protected]>)v1…v2: https://lore.kernel.org/all/[email protected]
- This follows Kees' feedback regarding the general policy and "is it really needed?". Since I don't think that this is of general usage I replaced them all with 0 and corrected the spacing at the beginning.-
can_print_rcvlist()is now using a %ps to print the name of the function. Everything is a sock pointer (or some other data structure) and is now 0.net/atm/proc.c | 7 +++---- net/can/bcm.c | 4 +--- net/can/proc.c | 12 ++++-------- net/ipv4/ping.c | 5 ++--- net/ipv4/raw.c | 4 ++-- net/ipv4/tcp_ipv4.c | 13 ++++++------- net/ipv4/udp.c | 5 ++--- net/ipv6/datagram.c | 5 ++--- net/ipv6/tcp_ipv6.c | 12 ++++++------ net/key/af_key.c | 5 ++--- net/netlink/af_netlink.c | 5 ++--- net/packet/af_packet.c | 7 ++----- net/phonet/socket.c | 5 ++--- net/sctp/proc.c | 6 +++--- net/unix/af_unix.c | 3 +-- 15 files changed, 40 insertions(+), 58 deletions(-)net/atm/proc.c +3
-4@@ -159,7 +159,7 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc) {struct sock *sk =sk_atm (vcc); -seq_printf (seq,"%pK " , vcc); +seq_puts (seq," 0 " );if (!vcc->dev)seq_printf (seq,"Unassigned " );else @@ -228,9 +228,8 @@ static const struct seq_operations pvc_seq_ops = {static int vcc_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) { -seq_printf (seq,sizeof (void *) ==4 ?"%-8s%s" :"%-16s%s" , -"Address " ,"Itf VPI VCI Fam Flags Reply " -"Send buffer Recv buffer [refcnt]\n" ); +seq_puts (seq,"Address Itf VPI VCI Fam Flags Reply " +"Send buffer Recv buffer [refcnt]\n" ); }else {struct vcc_state *state = seq->private;struct atm_vcc *vcc =atm_sk (state->sk);net/can/bcm.c +1
-3@@ -220,9 +220,7 @@ static int bcm_proc_show(struct seq_file *m, void *v)struct bcm_sock *bo =bcm_sk (sk);struct bcm_op *op; -seq_printf (m,">>> socket %pK" , sk->sk_socket); -seq_printf (m," / sk %pK" , sk); -seq_printf (m," / bo %pK" , bo); +seq_puts (m,">>> socket 0 / sk 0 / bo 0" );seq_printf (m," / dropped %lu" , bo->dropped_usr_msgs);seq_printf (m," / bound %s" ,bcm_proc_getifname (net, ifname, bo->ifindex));seq_printf (m," <<<\n" );net/can/proc.c +4
-8@@ -192,12 +192,11 @@ static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list,hlist_for_each_entry_rcu (r, rx_list, list) {char *fmt = (r->can_id &CAN_EFF_FLAG )? -" %-5s %08x %08x %pK %pK %8ld %s\n" : -" %-5s %03x %08x %pK %pK %8ld %s\n" ; +" %-5s %08x %08x %-20ps %8u %8ld %s\n" : +" %-5s %03x %08x %-20ps %8u %8ld %s\n" ;seq_printf (m, fmt,DNAME (dev), r->can_id, r->mask, - r->func, r->data,atomic_long_read (&r->matches), - r->ident); + r->func,0 ,atomic_long_read (&r->matches), r->ident); } }@@ -207,10 +206,7 @@ static void can_print_recv_banner(struct seq_file *m)* can1. 00000000 00000000 00000000 * ....... 0 tp20 */ -if (IS_ENABLED (CONFIG_64BIT )) -seq_puts (m," device can_id can_mask function userdata matches ident\n" ); -else -seq_puts (m," device can_id can_mask function userdata matches ident\n" ); +seq_puts (m," device can_id can_mask function userdata matches ident\n" ); }static int can_stats_proc_show (struct seq_file *m,void *v)net/ipv4/ping.c +2
-3@@ -1095,15 +1095,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int ping_v4_seq_show (struct seq_file *seq,void *v)net/ipv4/raw.c +2
-2@@ -1054,14 +1054,14 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) srcp = inet->inet_num;seq_printf (seq,"%4d: %08X:%04X %08X:%04X" -" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n" , i, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp,sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int raw_seq_show (struct seq_file *seq,void *v)net/ipv4/tcp_ipv4.c +6
-7@@ -2748,7 +2748,7 @@ static void get_openreq4(const struct request_sock *req,long delta = req->rsk_timer.expires - jiffies; seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d 0", i, ireq->ir_loc_addr, ireq->ir_num,@@ -2763,8 +2763,7 @@ static void get_openreq4(const struct request_sock *req, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ -0 , - req); + 0); }static void get_tcp4_sock (struct sock *sk,struct seq_file *f,int i)@@ -2811,7 +2810,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) READ_ONCE(tp->copied_seq), 0); seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " - "%08X %5u %8d %llu %d %pK %lu %lu %u %u %d", + "%08X %5u %8d %llu %d 0 %lu %lu %u %u %d", i, src, srcp, dest, destp, state, READ_ONCE(tp->write_seq) - tp->snd_una, rx_queue,@@ -2821,7 +2820,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)from_kuid_munged (seq_user_ns (f),sk_uid (sk)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, +refcount_read (&sk->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sk),@@ -2844,10 +2843,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" , +" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0" , i, src, srcp, dest, destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , -refcount_read (&tw->tw_refcnt), tw); +refcount_read (&tw->tw_refcnt)); }#define TMPSZ 150net/ipv4/udp.c +2
-3@@ -3283,15 +3283,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),udp_rqueue_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int udp4_seq_show (struct seq_file *seq,void *v)net/ipv6/datagram.c +2
-3@@ -1102,7 +1102,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, src = &sp->sk_v6_rcv_saddr; seq_printf(seq, "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n", bucket, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,@@ -1115,6 +1115,5 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, - sk_drops_read(sp)); + refcount_read(&sp->sk_refcnt), sk_drops_read(sp)); }net/ipv6/tcp_ipv6.c +6
-6@@ -2103,7 +2103,7 @@ static void get_openreq6(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3],@@ -2120,7 +2120,7 @@ static void get_openreq6(struct seq_file *seq, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ - 0, req); + 0); }static void get_tcp6_sock (struct seq_file *seq,struct sock *sp,int i)@@ -2171,7 +2171,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %lu %lu %u %u %d\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %lu %lu %u %u %d\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,@@ -2186,7 +2186,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, +refcount_read (&sp->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sp),@@ -2211,7 +2211,7 @@ static void get_timewait6_sock(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,@@ -2219,7 +2219,7 @@ static void get_timewait6_sock(struct seq_file *seq, dest->s6_addr32[2 ], dest->s6_addr32[3 ], destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , - refcount_read(&tw->tw_refcnt), tw); + refcount_read(&tw->tw_refcnt)); }static int tcp6_seq_show (struct seq_file *seq,void *v)net/key/af_key.c +2
-3@@ -3803,10 +3803,9 @@ static int pfkey_seq_show(struct seq_file *f, void *v)struct sock *s =sk_entry (v);if (v ==SEQ_START_TOKEN ) -seq_printf (f ,"sk RefCnt Rmem Wmem User Inode\n" ); +seq_puts (f,"sk RefCnt Rmem Wmem User Inode\n" );else - seq_printf(f, "%pK %-6d %-6u %-6u %-6u %-6llu\n", - s, + seq_printf(f, "0 %-6d %-6u %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s),net/netlink/af_netlink.c +2
-3@@ -2700,14 +2700,13 @@ static int netlink_native_seq_show(struct seq_file *seq, void *v) {if (v ==SEQ_START_TOKEN ) {seq_puts (seq, -"sk Eth Pid Groups " +"sk Eth Pid Groups " "Rmem Wmem Dump Locks Drops Inode\n" ); }else {struct sock *s = v;struct netlink_sock *nlk =nlk_sk (s); - seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", - s, + seq_printf(seq, "0 %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", s->sk_protocol, nlk->portid, nlk->groups ? (u32)nlk->groups[0] : 0,net/packet/af_packet.c +2
-5@@ -4744,16 +4744,13 @@ static void packet_seq_stop(struct seq_file *seq, void *v)static int packet_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) -seq_printf (seq, -"%*sRefCnt Type Proto Iface R Rmem User Inode\n" , -IS_ENABLED (CONFIG_64BIT ) ?-17 :-9 ,"sk" ); +seq_puts (seq,"sk RefCnt Type Proto Iface R Rmem User Inode\n" );else {struct sock *s =sk_entry (v);const struct packet_sock *po =pkt_sk (s); seq_printf(seq, - "%pK %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", - s, + "0 %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), s->sk_type, ntohs(READ_ONCE(po->num)),net/phonet/socket.c +2
-3@@ -586,14 +586,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)struct pn_sock *pn =pn_sk (sk);seq_printf (seq,"%2d %04X:%04X:%02X %02X %08X:%08X %5d %llu " -"%d %pK %u" , +"%d 0 %u" , sk->sk_protocol, pn->sobject, pn->dobject, pn->resource, sk->sk_state,sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk),from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, -sk_drops_read (sk)); +refcount_read (&sk->sk_refcnt),sk_drops_read (sk)); }seq_pad (seq,'\n' );return 0 ;net/sctp/proc.c +3
-3@@ -174,7 +174,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) sk = ep->base.sk;if (!net_eq (sock_net (sk),seq_file_net (seq)))continue ; - seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5u %5llu ", ep, sk, + seq_printf(seq, "%8d %8d %-3d %-3d %-4d %-5d %5u %5llu ", 0, 0, sctp_sk(sk)->type, sk->sk_state, hash, ep->base.bind_addr.port, from_kuid_munged(seq_user_ns(seq), sk_uid(sk)),@@ -260,9 +260,9 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) sk = epb->sk; seq_printf(seq, - "%8pK %8pK %-3d %-3d %-2d %-4d " + "%8d %8d %-3d %-3d %-2d %-4d " "%4d %8d %8d %7u %5llu %-5d %5d ", - assoc, sk, sctp_sk(sk)->type, sk->sk_state, + 0, 0, sctp_sk(sk)->type, sk->sk_state, assoc->state, 0, assoc->assoc_id, assoc->sndbuf_used,net/unix/af_unix.c +1
-2@@ -3555,8 +3555,7 @@ static int unix_seq_show(struct seq_file *seq, void *v)struct unix_sock *u =unix_sk (s);unix_state_lock (s); - seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5llu", - s, + seq_printf(seq, "%08u: %08X %08X %08X %04X %02X %5llu", 0, refcount_read(&s->sk_refcnt), 0, s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
Quoted 5 lines · Oliver Hartkopp
Quoted 3 lines
---
v3…v4: https://lore.kernel.org/all/[email protected]/
- The CAN changes have been dropped.No. They are still part of your patch - in the former way.
unbelievable. So I just resent v3 and though that I forgot to update the patch description so I stripped the can bits.
Quoted 4 lines
Would you like to integrate my patch into yours or do you want me to rebase my code once it shows up in net-next?
No, it is too big for my taste. Please route it your usual way. The plan is to get rid of %pK once all users are gone so there is no need to have it merged as part of this one.
Quoted 2 lines
Best regards,
Oliver
Sebastian
PATCH v4 1/1 net: Replace %pK output with 0
Commit 71338aa7d050c ("net: convert %p usage to %pK") which is from 2011 and changed the %p annotation for pointer to %pK. Back then the default behaviour for %p was to print the pointer. The %pK modifier was introduced to able to control the behaviour of specific pointer values without changing the behaviour of %p for everyone. It was dedicated to avoid leaking pointers via /proc.
There was also the idea to remove the check from formatting the string and move to the open callback with some helpers but this did not happen.
Things changed over time. The default behaviour for %p is now to print a hash pointer which does not leak the address but allows to correlate if two pointers are equal.
The policy on %p is to not introduce new ones. This is somehow in between since it already exists. The pointer are usually socket pointers and I don't see any value in exposing them. Therefore I am following the recommendation of removing them. Since their usage in /proc/ can be considered ABI I replace the pointer with a 0.
Replace the %pK annotation with 0 value. Correct the spacing for the cases where pointer is at the beginning.
---
v3…v4: https://lore.kernel.org/all/[email protected]/
- The CAN changes have been dropped. There will be different change removing the %p coming from the CAN department. There is now no %pS user in this patch but the issue sashiko complained about is in the works…
- Field description updated in Documentation/networking/proc_net_tcp.rst
v2…v3: https://lore.kernel.org/all/[email protected]/
- seq_printf() with static strings have been replaced with seq_puts() (checkpatch)
- Added missing fixed length in the CAN_EFF_FLAG case (can_print_rcvlist(), sashiko)
- Added missing 0 in get_timewait6_sock() (Jakub)
- Added back padding to the unix_seq_show() output. There is a selftest which checks the length of the first line. (kernel test robot <[email protected]>)
v1…v2: https://lore.kernel.org/all/[email protected]
- This follows Kees' feedback regarding the general policy and "is it really needed?". Since I don't think that this is of general usage I replaced them all with 0 and corrected the spacing at the beginning.
- can_print_rcvlist() is now using a %ps to print the name of the function. Everything is a sock pointer (or some other data structure) and is now 0.
Documentation/networking/proc_net_tcp.rst | 20 ++++++++++---------- net/atm/proc.c | 7 +++---- net/ipv4/ping.c | 5 ++--- net/ipv4/raw.c | 4 ++-- net/ipv4/tcp_ipv4.c | 13 ++++++------- net/ipv4/udp.c | 5 ++--- net/ipv6/datagram.c | 5 ++--- net/ipv6/tcp_ipv6.c | 12 ++++++------ net/key/af_key.c | 5 ++--- net/netlink/af_netlink.c | 5 ++--- net/packet/af_packet.c | 7 ++----- net/phonet/socket.c | 5 ++--- net/sctp/proc.c | 6 +++--- net/unix/af_unix.c | 3 +-- 14 files changed, 45 insertions(+), 57 deletions(-)
Documentation/networking/proc_net_tcp.rst +10 -10
@@ -30,16 +30,16 @@ TCP connections. A typical entry of /proc/net/tcp would look like this (split | |----------------------> receive-queue |-------------------------------> transmit-queue - 1000 0 54165785 4 cd1e6040 25 4 27 3 -1 - | | | | | | | | | |--> slow start size threshold, - | | | | | | | | | or -1 if the threshold - | | | | | | | | | is >= 0xFFFF - | | | | | | | | |----> sending congestion window - | | | | | | | |-------> (ack.quick<<1)|ack.pingpong - | | | | | | |---------> Predicted tick of soft clock - | | | | | | (delayed ACK control data) - | | | | | |------------> retransmit timeout - | | | | |------------------> location of socket in memory + 1000 0 54165785 4 0 25 4 27 3 -1 + | | | | | | | | | |-------> slow start size threshold, + | | | | | | | | | or -1 if the threshold + | | | | | | | | | is >= 0xFFFF + | | | | | | | | |---------> sending congestion window + | | | | | | | |------------> (ack.quick<<1)|ack.pingpong + | | | | | | |--------------> Predicted tick of soft clock + | | | | | | (delayed ACK control data) + | | | | | |-----------------> retransmit timeout + | | | | |--------------------> always 0 (was memory location). | | | |-----------------------> socket reference count | | |-----------------------------> inode | |----------------------------------> unanswered 0-window probes
net/atm/proc.c +3 -4
@@ -159,7 +159,7 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc) {struct sock *sk =sk_atm (vcc); -seq_printf (seq,"%pK " , vcc); +seq_puts (seq," 0 " );if (!vcc->dev)seq_printf (seq,"Unassigned " );else
@@ -228,9 +228,8 @@ static const struct seq_operations pvc_seq_ops = {static int vcc_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) { -seq_printf (seq,sizeof (void *) ==4 ?"%-8s%s" :"%-16s%s" , -"Address " ,"Itf VPI VCI Fam Flags Reply " -"Send buffer Recv buffer [refcnt]\n" ); +seq_puts (seq,"Address Itf VPI VCI Fam Flags Reply " +"Send buffer Recv buffer [refcnt]\n" ); }else {struct vcc_state *state = seq->private;struct atm_vcc *vcc =atm_sk (state->sk);
net/ipv4/ping.c +2 -3
@@ -1095,15 +1095,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int ping_v4_seq_show (struct seq_file *seq,void *v)
net/ipv4/raw.c +2 -2
@@ -1054,14 +1054,14 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) srcp = inet->inet_num;seq_printf (seq,"%4d: %08X:%04X %08X:%04X" -" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n" , i, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp,sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int raw_seq_show (struct seq_file *seq,void *v)
net/ipv4/tcp_ipv4.c +6 -7
@@ -2748,7 +2748,7 @@ static void get_openreq4(const struct request_sock *req,long delta = req->rsk_timer.expires - jiffies; seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d 0", i, ireq->ir_loc_addr, ireq->ir_num,
@@ -2763,8 +2763,7 @@ static void get_openreq4(const struct request_sock *req, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ -0 , - req); + 0); }static void get_tcp4_sock (struct sock *sk,struct seq_file *f,int i)
@@ -2811,7 +2810,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) READ_ONCE(tp->copied_seq), 0); seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " - "%08X %5u %8d %llu %d %pK %lu %lu %u %u %d", + "%08X %5u %8d %llu %d 0 %lu %lu %u %u %d", i, src, srcp, dest, destp, state, READ_ONCE(tp->write_seq) - tp->snd_una, rx_queue,
@@ -2821,7 +2820,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i)from_kuid_munged (seq_user_ns (f),sk_uid (sk)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, +refcount_read (&sk->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sk),
@@ -2844,10 +2843,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" , +" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0" , i, src, srcp, dest, destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , -refcount_read (&tw->tw_refcnt), tw); +refcount_read (&tw->tw_refcnt)); }#define TMPSZ 150
net/ipv4/udp.c +2 -3
@@ -3283,15 +3283,14 @@ 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 %llu %d %pK %u" , +" %02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u" , bucket, src, srcp, dest, destp, sp->sk_state,sk_wmem_alloc_get (sp),udp_rqueue_get (sp),0 ,0L ,0 ,from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, -sk_drops_read (sp)); +refcount_read (&sp->sk_refcnt),sk_drops_read (sp)); }static int udp4_seq_show (struct seq_file *seq,void *v)
net/ipv6/datagram.c +2 -3
@@ -1102,7 +1102,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, src = &sp->sk_v6_rcv_saddr; seq_printf(seq, "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %u\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %u\n", bucket, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -1115,6 +1115,5 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, - sk_drops_read(sp)); + refcount_read(&sp->sk_refcnt), sk_drops_read(sp)); }
net/ipv6/tcp_ipv6.c +6 -6
@@ -2103,7 +2103,7 @@ static void get_openreq6(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3],
@@ -2120,7 +2120,7 @@ static void get_openreq6(struct seq_file *seq, sk_uid(req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ - 0, req); + 0); }static void get_tcp6_sock (struct seq_file *seq,struct sock *sp,int i)
@@ -2171,7 +2171,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %lu %lu %u %u %d\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %lu %lu %u %u %d\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -2186,7 +2186,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sp), -refcount_read (&sp->sk_refcnt), sp, +refcount_read (&sp->sk_refcnt),jiffies_to_clock_t (icsk->icsk_rto),jiffies_to_clock_t (icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | inet_csk_in_pingpong_mode(sp),
@@ -2211,7 +2211,7 @@ static void get_timewait6_sock(struct seq_file *seq, seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK\n", + "%02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d 0\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -2219,7 +2219,7 @@ static void get_timewait6_sock(struct seq_file *seq, dest->s6_addr32[2 ], dest->s6_addr32[3 ], destp,READ_ONCE (tw->tw_substate),0 ,0 ,3 ,jiffies_delta_to_clock_t (delta),0 ,0 ,0 ,0 , - refcount_read(&tw->tw_refcnt), tw); + refcount_read(&tw->tw_refcnt)); }static int tcp6_seq_show (struct seq_file *seq,void *v)
net/key/af_key.c +2 -3
@@ -3803,10 +3803,9 @@ static int pfkey_seq_show(struct seq_file *f, void *v)struct sock *s =sk_entry (v);if (v ==SEQ_START_TOKEN ) -seq_printf (f ,"sk RefCnt Rmem Wmem User Inode\n" ); +seq_puts (f,"sk RefCnt Rmem Wmem User Inode\n" );else - seq_printf(f, "%pK %-6d %-6u %-6u %-6u %-6llu\n", - s, + seq_printf(f, "0 %-6d %-6u %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s),
net/netlink/af_netlink.c +2 -3
@@ -2700,14 +2700,13 @@ static int netlink_native_seq_show(struct seq_file *seq, void *v) {if (v ==SEQ_START_TOKEN ) {seq_puts (seq, -"sk Eth Pid Groups " +"sk Eth Pid Groups " "Rmem Wmem Dump Locks Drops Inode\n" ); }else {struct sock *s = v;struct netlink_sock *nlk =nlk_sk (s); - seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", - s, + seq_printf(seq, "0 %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8u %-8llu\n", s->sk_protocol, nlk->portid, nlk->groups ? (u32)nlk->groups[0] : 0,
net/packet/af_packet.c +2 -5
@@ -4825,16 +4825,13 @@ static void packet_seq_stop(struct seq_file *seq, void *v)static int packet_seq_show (struct seq_file *seq,void *v) {if (v ==SEQ_START_TOKEN ) -seq_printf (seq, -"%*sRefCnt Type Proto Iface R Rmem User Inode\n" , -IS_ENABLED (CONFIG_64BIT ) ?-17 :-9 ,"sk" ); +seq_puts (seq,"sk RefCnt Type Proto Iface R Rmem User Inode\n" );else {struct sock *s =sk_entry (v);const struct packet_sock *po =pkt_sk (s); seq_printf(seq, - "%pK %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", - s, + "0 %-6d %-4d %04x %-5d %1d %-6u %-6u %-6llu\n", refcount_read(&s->sk_refcnt), s->sk_type, ntohs(READ_ONCE(po->num)),
net/phonet/socket.c +2 -3
@@ -586,14 +586,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)struct pn_sock *pn =pn_sk (sk);seq_printf (seq,"%2d %04X:%04X:%02X %02X %08X:%08X %5d %llu " -"%d %pK %u" , +"%d 0 %u" , sk->sk_protocol, pn->sobject, pn->dobject, pn->resource, sk->sk_state,sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk),from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), -refcount_read (&sk->sk_refcnt), sk, -sk_drops_read (sk)); +refcount_read (&sk->sk_refcnt),sk_drops_read (sk)); }seq_pad (seq,'\n' );return 0 ;
net/sctp/proc.c +3 -3
@@ -174,7 +174,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) sk = ep->base.sk;if (!net_eq (sock_net (sk),seq_file_net (seq)))continue ; - seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5u %5llu ", ep, sk, + seq_printf(seq, "%8d %8d %-3d %-3d %-4d %-5d %5u %5llu ", 0, 0, sctp_sk(sk)->type, sk->sk_state, hash, ep->base.bind_addr.port, from_kuid_munged(seq_user_ns(seq), sk_uid(sk)),
@@ -260,9 +260,9 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) sk = epb->sk; seq_printf(seq, - "%8pK %8pK %-3d %-3d %-2d %-4d " + "%8d %8d %-3d %-3d %-2d %-4d " "%4d %8d %8d %7u %5llu %-5d %5d ", - assoc, sk, sctp_sk(sk)->type, sk->sk_state, + 0, 0, sctp_sk(sk)->type, sk->sk_state, assoc->state, 0, assoc->assoc_id, assoc->sndbuf_used,
net/unix/af_unix.c +1 -2
@@ -3562,8 +3562,7 @@ static int unix_seq_show(struct seq_file *seq, void *v)struct unix_sock *u =unix_sk (s);unix_state_lock (s); - seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5llu", - s, + seq_printf(seq, "%08u: %08X %08X %08X %04X %02X %5llu", 0, refcount_read(&s->sk_refcnt), 0, s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
Signature · 1 line
2.55.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Critical: 0 · High: 0 · Medium: 1 · Low: 1
- [Medium] Incomplete conversion relative to the commit's stated scope:
after this patch net/ still contains %pK socket/object-pointer output.
- [Low] The updated /proc/net/tcp example in Documentation/networking/proc_net_tcp.rst does not match the…
--
net: Replace %pK output with 0
This replaces the %pK pointer output in the various /proc/net seq_file printers with a literal 0, adjusting field spacing and header strings so the column layout stays intact. Documentation/networking/proc_net_tcp.rst is updated to describe the field as always 0.
Quoted 1 line
net: Replace %pK output with 0
[ ... ]
Quoted 2 lines
Replace the %pK annotation with 0 value. Correct the spacing for the cases where pointer is at the beginning.
[Severity: Medium]
The subject and this sentence read as if net/ no longer emits pointers, but three files under net/ still use %pK after this commit:
net/bluetooth/af_bluetooth.c:bt_seq_show()
seq_printf(seq, "%pK %-6d %-6u %-6u %-6u %-6llu %-6llu", sk,
net/can/proc.c:can_print_rcvlist()
char *fmt = (r->can_id & CAN_EFF_FLAG)? " %-5s %08x %08x %pK %pK %8ld %s\n" : " %-5s %03x %08x %pK %pK %8ld %s\n";
net/can/bcm.c:bcm_proc_show()
seq_printf(m, ">>> socket %pK", sk->sk_socket); seq_printf(m, " / sk %pK", sk); seq_printf(m, " / bo %pK", bo);
bt_seq_show() is installed by bt_procfs_init() for every Bluetooth protocol, so /proc/net/l2cap, /proc/net/sco, /proc/net/rfcomm*, /proc/net/hci*, /proc/net/iso, /proc/net/bnep and /proc/net/hidp keep printing the struct sock pointer.
The changelog below the '---' line says the CAN changes were dropped on purpose, but that text is discarded when the patch is applied, and the Bluetooth site is not mentioned at all. Could the commit message name the remaining sites so git log does not suggest net/ was fully converted?
Quoted 9 lines
Documentation/networking/proc_net_tcp.rst +0
-1@@ -30,16 +30,16 @@ up into 3 parts because of the length of the line):: | |----------------------> receive-queue |-------------------------------> transmit-queue - 1000 0 54165785 4 cd1e6040 25 4 27 3 -1
Documentation/networking/proc_net_tcp.rst up into 3 parts because of the length of the line):: · line 33
Quoted 10 lines
Documentation/networking/proc_net_tcp.rst +1
-9- | | | | | | | | | |--> slow start size threshold, - | | | | | | | | | or -1 if the threshold - | | | | | | | | | is >= 0xFFFF - | | | | | | | | |----> sending congestion window - | | | | | | | |-------> (ack.quick<<1)|ack.pingpong - | | | | | | |---------> Predicted tick of soft clock - | | | | | | (delayed ACK control data) - | | | | | |------------> retransmit timeout - | | | | |------------------> location of socket in memory + 1000 0 54165785 4 0 25 4 27 3 -1
[Severity: Low]
Does the example still match what the kernel prints? The example shows two spaces on each side of the new always-zero field, while get_tcp4_sock() in net/ipv4/tcp_ipv4.c and get_tcp6_sock() in net/ipv6/tcp_ipv6.c both emit a single space on each side:
"%08X %5u %8d %llu %d 0 %lu %lu %u %u %d"
so the real line is:
1000 0 54165785 4 0 25 4 27 3 -1
Should the example (and the arrow alignment below it) use the single-space spacing, or should the format strings pad the field if the wider column is intended?
Quoted 12 lines
Documentation/networking/proc_net_tcp.rst +9
-0+ | | | | | | | | | |-------> slow start size threshold, + | | | | | | | | | or -1 if the threshold + | | | | | | | | | is >= 0xFFFF + | | | | | | | | |---------> sending congestion window + | | | | | | | |------------> (ack.quick<<1)|ack.pingpong + | | | | | | |--------------> Predicted tick of soft clock + | | | | | | (delayed ACK control data) + | | | | | |-----------------> retransmit timeout + | | | | |--------------------> always 0 (was memory location). | | | |-----------------------> socket reference count | | |-----------------------------> inode | |----------------------------------> unanswered 0-window probes
[ ... ]
Quoted 13 lines
net/ipv4/tcp_ipv4.c +1
-1@@ -2811,7 +2810,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) READ_ONCE(tp->copied_seq), 0); seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " - "%08X %5u %8d %llu %d %pK %lu %lu %u %u %d", + "%08X %5u %8d %llu %d 0 %lu %lu %u %u %d", i, src, srcp, dest, destp, state, READ_ONCE(tp->write_seq) - tp->snd_una, rx_queue,
[ ... ]
Quoted 13 lines
net/ipv6/tcp_ipv6.c +1
-1@@ -2171,7 +2171,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) seq_printf(seq, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " - "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d %pK %lu %lu %u %u %d\n", + "%02X %08X:%08X %02X:%08lX %08X %5u %8d %llu %d 0 %lu %lu %u %u %d\n", i, src->s6_addr32[0], src->s6_addr32[1], src->s6_addr32[2], src->s6_addr32[3], srcp,
[ ... ]
Signature · 1 line
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260901160345.eeknHmY2%40linutronix.de
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 1 Sep 2026 18:03:45 +0200 you wrote:
Commit
71338aa7d050c("net: convert %p usage to %pK") which is from 2011 and changed the %p annotation for pointer to %pK. Back then the default behaviour for %p was to print the pointer. The %pK modifier was introduced to able to control the behaviour of specific pointer values without changing the behaviour of %p for everyone. It was dedicated to avoid leaking pointers via /proc.[...]
Here is the summary with links:
- [net-next,real,v4] net: Replace %pK output with 0
https://git.kernel.org/netdev/net-next/c/7c0ec6288b49
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html