Commit 689adb36 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

inet: ping: make ping_port_rover per netns 



Provide isolation between netns for ping idents.

Randomize initial ping_port_rover value at netns creation.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250829153054.474201-4-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 10343e7e

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ struct netns_ipv4 { 
	int sysctl_igmp_qrv;



	struct ping_group_range ping_group_range;

	u16			ping_port_rover;



	atomic_t dev_addr_genid;

net/ipv4/ping.c

+5 −5
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ static struct ping_table ping_table; 
struct pingv6_ops pingv6_ops;

EXPORT_SYMBOL_GPL(pingv6_ops);



static u16 ping_port_rover;



static inline u32 ping_hashfn(const struct net *net, u32 num, u32 mask)

{

	u32 res = (num + net_hash_mix(net)) & mask;
@@ -84,12 +82,12 @@ int ping_get_port(struct sock *sk, unsigned short ident) 
	isk = inet_sk(sk);

	spin_lock(&ping_table.lock);

	if (ident == 0) {

		u16 result = net->ipv4.ping_port_rover + 1;

		u32 i;

		u16 result = ping_port_rover + 1;



		for (i = 0; i < (1L << 16); i++, result++) {

			if (!result)

				result++; /* avoid zero */

				continue; /* avoid zero */

			hlist = ping_hashslot(&ping_table, net, result);

			sk_for_each(sk2, hlist) {

				if (!net_eq(sock_net(sk2), net))
@@ -101,7 +99,7 @@ int ping_get_port(struct sock *sk, unsigned short ident) 
			}



			/* found */

			ping_port_rover = ident = result;

			net->ipv4.ping_port_rover = ident = result;

			break;

next_port:

			;
@@ -1146,6 +1144,8 @@ static int __net_init ping_v4_proc_init_net(struct net *net) 
	if (!proc_create_net("icmp", 0444, net->proc_net, &ping_v4_seq_ops,

			sizeof(struct ping_iter_state)))

		return -ENOMEM;



	net->ipv4.ping_port_rover = get_random_u16();

	return 0;

}