From 454e00abb33e2663382fd34522c8ce07413f153b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 6 Feb 2022 13:05:56 +0100 Subject: [PATCH] Revert "net: fix information leakage in /proc/net/ptype" This reverts commit e372ecd455b6ebc7720f52bf4b5f5d44d02f2092 which is commit 47934e06b65637c88a762d9c98329ae6e3238888 upstream. It causes an abi break, and is not anything that the Android kernels worry about, so revert it. Fixes: e372ecd455b6 ("net: fix information leakage in /proc/net/ptype") Signed-off-by: Greg Kroah-Hartman Change-Id: I76aa3718185ce6bc3e1941f68b7f574fda49d08a --- include/linux/netdevice.h | 1 - net/core/net-procfs.c | 3 +-- net/packet/af_packet.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ce1472558020..de91944c7149 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2409,7 +2409,6 @@ struct packet_type { struct net_device *); bool (*id_match)(struct packet_type *ptype, struct sock *sk); - struct net *af_packet_net; void *af_packet_priv; struct list_head list; diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 61f5570645e3..4bd4ca70fa5d 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c @@ -281,8 +281,7 @@ static int ptype_seq_show(struct seq_file *seq, void *v) if (v == SEQ_START_TOKEN) seq_puts(seq, "Type Device Function\n"); - else if ((!pt->af_packet_net || net_eq(pt->af_packet_net, seq_file_net(seq))) && - (!pt->dev || net_eq(dev_net(pt->dev), seq_file_net(seq)))) { + else if (pt->dev == NULL || dev_net(pt->dev) == seq_file_net(seq)) { if (pt->type == htons(ETH_P_ALL)) seq_puts(seq, "ALL "); else diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 839e1caa57a5..6062bd5bf132 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1715,7 +1715,6 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) match->prot_hook.dev = po->prot_hook.dev; match->prot_hook.func = packet_rcv_fanout; match->prot_hook.af_packet_priv = match; - match->prot_hook.af_packet_net = read_pnet(&match->net); match->prot_hook.id_match = match_fanout_group; list_add(&match->list, &fanout_list); } @@ -3295,7 +3294,6 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, po->prot_hook.func = packet_rcv_spkt; po->prot_hook.af_packet_priv = sk; - po->prot_hook.af_packet_net = sock_net(sk); if (proto) { po->prot_hook.type = proto;