From: Willem de Bruijn <willemb@google.com>
Date: Fri, 3 Jul 2020 20:43:08 +0000 (-0400)
Subject: ipv6/ping: set skb->mark on icmpv6 sockets
X-Git-Tag: v5.10.7~1943^2~348
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd8700e45e73c5e5c32260ebc3092e50c1853e5d;p=platform%2Fkernel%2Flinux-rpi.git

ipv6/ping: set skb->mark on icmpv6 sockets

IPv6 ping sockets route based on fwmark, but do not yet set skb->mark.
Add this. IPv4 ping sockets also do both.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 98ac32b..6caa062 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -114,6 +114,7 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 	security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
 	ipcm6_init_sk(&ipc6, np);
+	ipc6.sockc.mark = sk->sk_mark;
 	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);
 
 	dst = ip6_sk_dst_lookup_flow(sk, &fl6, daddr, false);