diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-29 08:51:34 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-11-01 13:12:48 +0000 |
| commit | 42dcfd850e514b229d616a53dec06d0f2533217c (patch) | |
| tree | 535ebfe93c501e7fa1e77db149ac01b53ff18d72 /net/ipv6/udp.c | |
| parent | cls_flower: Fix inability to match GRE/IPIP packets (diff) | |
| download | linux-dev-42dcfd850e514b229d616a53dec06d0f2533217c.tar.xz linux-dev-42dcfd850e514b229d616a53dec06d0f2533217c.zip | |
udp6: allow SO_MARK ctrl msg to affect routing
Commit c6af0c227a22 ("ip: support SO_MARK cmsg")
added propagation of SO_MARK from cmsg to skb->mark.
For IPv4 and raw sockets the mark also affects route
lookup, but in case of IPv6 the flow info is
initialized before cmsg is parsed.
Fixes: c6af0c227a22 ("ip: support SO_MARK cmsg")
Reported-and-tested-by: Xintong Hu <huxintong@fb.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 8d785232b479..be6dc64ece29 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1435,7 +1435,6 @@ do_udp_sendmsg: if (!fl6.flowi6_oif) fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex; - fl6.flowi6_mark = ipc6.sockc.mark; fl6.flowi6_uid = sk->sk_uid; if (msg->msg_controllen) { @@ -1471,6 +1470,7 @@ do_udp_sendmsg: ipc6.opt = opt; fl6.flowi6_proto = sk->sk_protocol; + fl6.flowi6_mark = ipc6.sockc.mark; fl6.daddr = *daddr; if (ipv6_addr_any(&fl6.saddr) && !ipv6_addr_any(&np->saddr)) fl6.saddr = np->saddr; |