summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorCongyu Liu <liu3101@purdue.edu>2022-01-18 14:20:13 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-01 17:27:07 +0100
commite43669c77cb3a742b7d84ecdc7c68c4167a7709b (patch)
treede425b29336196e37688aba873ee4c1d29af9b57 /net/packet
parent1515e72aae803fc6b466adf918e71c4e4c9d5b3d (diff)
downloadlinux-stable-e43669c77cb3a742b7d84ecdc7c68c4167a7709b.tar.gz
linux-stable-e43669c77cb3a742b7d84ecdc7c68c4167a7709b.tar.bz2
linux-stable-e43669c77cb3a742b7d84ecdc7c68c4167a7709b.zip
net: fix information leakage in /proc/net/ptype
commit 47934e06b65637c88a762d9c98329ae6e3238888 upstream. In one net namespace, after creating a packet socket without binding it to a device, users in other net namespaces can observe the new `packet_type` added by this packet socket by reading `/proc/net/ptype` file. This is minor information leakage as packet socket is namespace aware. Add a net pointer in `packet_type` to keep the net namespace of of corresponding packet socket. In `ptype_seq_show`, this net pointer must be checked when it is not NULL. Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu <liu3101@purdue.edu> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1bc7ef49e148..1a138e8d32d6 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1738,6 +1738,7 @@ static int fanout_add(struct sock *sk, struct fanout_args *args)
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;
match->max_num_members = args->max_num_members;
list_add(&match->list, &fanout_list);
@@ -3323,6 +3324,7 @@ 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;