From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net, willemb@google.com
Cc: netdev@vger.kernel.org, yoshfuji@linux-ipv6.org,
dsahern@kernel.org, Jakub Kicinski <kuba@kernel.org>,
Xintong Hu <huxintong@fb.com>
Subject: [PATCH net 1/2] udp6: allow SO_MARK ctrl msg to affect routing
Date: Fri, 29 Oct 2021 08:51:34 -0700 [thread overview]
Message-ID: <20211029155135.468098-2-kuba@kernel.org> (raw)
In-Reply-To: <20211029155135.468098-1-kuba@kernel.org>
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>
---
net/ipv6/udp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
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 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
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;
--
2.31.1
next prev parent reply other threads:[~2021-10-29 15:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 15:51 [PATCH net 0/2] udp6: allow SO_MARK ctrl msg to affect routing Jakub Kicinski
2021-10-29 15:51 ` Jakub Kicinski [this message]
2021-10-29 18:22 ` [PATCH net 1/2] " David Ahern
2021-10-30 1:23 ` Willem de Bruijn
2021-10-29 15:51 ` [PATCH net 2/2] selftests: udp: test for passing SO_MARK as cmsg Jakub Kicinski
2021-10-29 18:24 ` David Ahern
2021-10-30 1:14 ` Willem de Bruijn
2021-11-01 13:20 ` [PATCH net 0/2] udp6: allow SO_MARK ctrl msg to affect routing patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029155135.468098-2-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=huxintong@fb.com \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).