Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Congyu Liu <liu3101@purdue.edu>
To:     davem@davemloft.net, kuba@kernel.org
Cc:     yajun.deng@linux.dev, edumazet@google.com, willemb@google.com,
        mkl@pengutronix.de, rsanger@wand.net.nz, wanghai38@huawei.com,
        pablo@netfilter.org, jiapeng.chong@linux.alibaba.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Congyu Liu <liu3101@purdue.edu>
Subject: [PATCH net] net: fix information leakage in /proc/net/ptype
Date:   Tue, 18 Jan 2022 02:00:29 -0500
Message-Id: <20220118070029.1157324-1-liu3101@purdue.edu>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4jpVVI5RyhIOLPhhB8p4/bwiphuhhQm5xRvECjuDmKVxi3T35jmlhk3WytN0?=
 =?us-ascii?Q?3ngubRkNbjOI4i9yvnNKRf4ei0q/8epCJuxg/SBPab9PxgK/I0juwKSjrRsG?=
 =?us-ascii?Q?jRjarUch7yem2ipbxCxuZrtIDsaFGXU4rnK/v9KriP9jyz8MWTb+NmpHaPbp?=
 =?us-ascii?Q?Fgd8Zc3MmzNjMvdJ4EBLfuDOlWDXuEQwlUNvkhi2MiFyeNYT+iATDEz/9sR9?=
 =?us-ascii?Q?DACiYFEzpumqtYAuyaAPN9RGYCiwwmdSRDh3qQaGOXzsg259rd+iuL9KLJ13?=
 =?us-ascii?Q?Ncpzi3kwzi3N6mmavPcpWUEOgyRGQ9Yxw8+A7ioHDtRhKOAhs9XLKNQ3d0EL?=
 =?us-ascii?Q?g1hEqoYjDQVPBsADp4Tehg2D7Waw/GaILMafRtqdqsLNkYRm5cwJvfBTRDVe?=
 =?us-ascii?Q?meeICCzl9uQux75TCcu7OkSEvRgrYcCjdNo3+F2xqh+vAiKss34575FbO84/?=
 =?us-ascii?Q?WMCSJztLK6sC5JI9okpvrDB02knuWIXulwZxG7nBJdn6Lnq4u/gD+RJ04wZ4?=
 =?us-ascii?Q?QzI0R8iX89xFp9V3q4nFnsx/cqSuPsxTO9flCetXvqxGa4NXKV9DInXNipRh?=
 =?us-ascii?Q?CgVpgEdMrZKMknVF7vPC1dHoUkJvJod5EL43fA8prbZUiugAhcoXnMALPQ2+?=
 =?us-ascii?Q?EfYBlZgevawxRkhf/C7Cbq9Ua8t7jxbqdqv/r2MswZ1/aWKikUFBOhKBiM7m?=
 =?us-ascii?Q?4sdjiRCEyFVNiHI+iabLDGxKZHC4+qFE7kmjygdHtNKojFz9sMhei5TXr7GP?=
 =?us-ascii?Q?N9hbmAhdKWajJ11pJ5e3yS+I9D8DEk9Xaf51qgkQqjxisgSJOu+Y+N+LItio?=
 =?us-ascii?Q?9nMq66oHh5SHyfUEtbAvBBC0yjJNs3GmqBHbftnPWl95TDSJX/gpj/JbLtqf?=
 =?us-ascii?Q?aVMM7Q9TKHj9AMs7E6jhdpzvUjZAhh0T/BHRSbibtckCBDGwxxGkKrBGf7tb?=
 =?us-ascii?Q?ZJ7GKaM1l5z9uxp+11S/ATtIN8+NCoGaHQWJ8q6sSu9yhjpVEJdAm8kMxRHV?=
 =?us-ascii?Q?wpbl55SirYDf3c/2RlhGpjUUPuNPrXf9Jf5HEocL8zCukUPNbLtkgYRpyf4R?=
 =?us-ascii?Q?EPmOCHSsQ3AEiUqwnaVRMhffFxpLYcxj1WE5ajDoJnlSMzuyQ5b6QvAWCvcJ?=
 =?us-ascii?Q?Bo8qrm6B3DA18bS3vNqn19ABJBkNkXCofT+z6xK+0qFEsUXfoxhvMOq7LLz7?=
 =?us-ascii?Q?nvMADLuG8sfN6uUBp8w956584/Pox9XL6CazscJdMvFxMlPXUKidRvrlMI8L?=
 =?us-ascii?Q?1H2hwtR0eu2wkT9JHxyBAGYK9EUBQWCOj82LIZpXgRBwgjUEtg9i9wuv7NoO?=
 =?us-ascii?Q?szsrk9UmbCyOYjaK7J9QLUEpq1NK07ZQHMtEz0VeF+H9/MiS5lXejOlx36GH?=
 =?us-ascii?Q?I4zSFLn0zq7GLIc4c/7an6zDM8IVzFMSjKMxZv6iYLotTuZv8vjOSjDkJ29G?=
 =?us-ascii?Q?QebM4fdbaL3I7PMayZoNckgl0v+4dzG825jFNb7I9nBC6p1UvzSng92NQEjO?=
 =?us-ascii?Q?xschLyys/mUHdI8nhUwtYmDZnQUxYa5Zt7yGVN9L7I2Eka3cR46DtomwPt4+?=
 =?us-ascii?Q?9jA3uug/N+qMZWoS0zXei+Uis7tpy3QUB0se2xLWszdLwBHd5F+t7/AnzSJs?=
 =?us-ascii?Q?/PNnFMuO6/pvrXYJBMPHYP0=3D?=
X-OriginatorOrg: purdue.edu
X-MS-Exchange-CrossTenant-Network-Message-Id: aaca8077-ad2b-411d-3b8e-08d9da504c33
X-MS-Exchange-CrossTenant-AuthSource: MWHPR2201MB1072.namprd22.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 07:01:06.1081
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4130bd39-7c53-419c-b1e5-8758d6d63f21
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CQb2tyTLaZlniV/4OaoOd+Z0qdMOEYljKCidbspBdK9R2anYXVUnaNMxgivEoa1IterQxkcUrZzlHFGvrrINJA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR22MB0088
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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. I believe this is minor information leakage as packet socket is
namespace aware.

Add a function pointer in `packet_type` to retrieve the net namespace
of corresponding packet socket. In `ptype_seq_show`, if this
function pointer is not NULL, use it to determine if certain ptype
should be shown.

Signed-off-by: Congyu Liu <liu3101@purdue.edu>
---
 include/linux/netdevice.h |  1 +
 net/core/net-procfs.c     |  3 ++-
 net/packet/af_packet.c    | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3213c7227b59..72d3601850c5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2548,6 +2548,7 @@ struct packet_type {
 					      struct net_device *);
 	bool			(*id_match)(struct packet_type *ptype,
 					    struct sock *sk);
+	struct net		*(*get_net) (struct packet_type *ptype);
 	void			*af_packet_priv;
 	struct list_head	list;
 };
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index d8b9dbabd4a4..fd5e8682058c 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -260,7 +260,8 @@ 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->dev == NULL || dev_net(pt->dev) == seq_file_net(seq)) {
+	else if ((pt->get_net && net_eq(pt->get_net(pt), seq_file_net(seq))) ||
+		 (!pt->get_net && (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 5bd409ab4cc2..7997b9db8280 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1678,6 +1678,14 @@ static bool fanout_find_new_id(struct sock *sk, u16 *new_id)
 	return false;
 }
 
+static struct net *fanout_ptype_get_net(struct packet_type *pt)
+{
+	struct packet_fanout *f;
+
+	f = pt->af_packet_priv;
+	return read_pnet(&f->net);
+}
+
 static int fanout_add(struct sock *sk, struct fanout_args *args)
 {
 	struct packet_rollover *rollover = NULL;
@@ -1774,6 +1782,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.get_net = fanout_ptype_get_net;
 		match->prot_hook.id_match = match_fanout_group;
 		match->max_num_members = args->max_num_members;
 		list_add(&match->list, &fanout_list);
@@ -3294,6 +3303,14 @@ static struct proto packet_proto = {
 	.obj_size = sizeof(struct packet_sock),
 };
 
+static struct net *packet_ptype_get_net(struct packet_type *pt)
+{
+	struct sock *sk;
+
+	sk = pt->af_packet_priv;
+	return sock_net(sk);
+}
+
 /*
  *	Create a packet of type SOCK_PACKET.
  */
@@ -3353,6 +3370,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.get_net = packet_ptype_get_net;
 
 	if (proto) {
 		po->prot_hook.type = proto;
-- 
2.25.1