Commit e8485911 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by Jakub Kicinski
Browse files

icmp: reflect tos through ip cookie rather than updating inet_sk 



Do not modify socket fields if it can be avoided.

The current code predates the introduction of ip cookies in commit
aa661581 ("ipv4: processing ancillary IP_TOS or IP_TTL"). Now that
cookies exist and support tos, update that field directly.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250214222720.3205500-6-willemdebruijn.kernel@gmail.com


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

net/ipv4/icmp.c

+2 −4
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 
	struct ipcm_cookie ipc;

	struct flowi4 fl4;

	struct sock *sk;

	struct inet_sock *inet;

	__be32 daddr, saddr;

	u32 mark = IP4_REPLY_MARK(net, skb->mark);

	int type = icmp_param->data.icmph.type;
@@ -424,12 +423,11 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 
	sk = icmp_xmit_lock(net);

	if (!sk)

		goto out_bh_enable;

	inet = inet_sk(sk);



	icmp_param->data.icmph.checksum = 0;



	ipcm_init(&ipc);

	inet->tos = ip_hdr(skb)->tos;

	ipc.tos = ip_hdr(skb)->tos;

	ipc.sockc.mark = mark;

	daddr = ipc.addr = ip_hdr(skb)->saddr;

	saddr = fib_compute_spec_dst(skb);
@@ -737,8 +735,8 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, 
	icmp_param.data.icmph.checksum	 = 0;

	icmp_param.skb	  = skb_in;

	icmp_param.offset = skb_network_offset(skb_in);

	inet_sk(sk)->tos = tos;

	ipcm_init(&ipc);

	ipc.tos = tos;

	ipc.addr = iph->saddr;

	ipc.opt = &icmp_param.replyopts.opt;

	ipc.sockc.mark = mark;