Commit 38b7097b authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv6: use TOS marks from sockets for routing decision 



In IPv6 the ToS values are part of the flowlabel in flowi6 and get
extracted during fib rule lookup, but we forgot to correctly initialize
the flowlabel before the routing lookup.

Reported-by: default avatar <liam.mcbirnie@boeing.com>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e69f73bf

net/ipv6/icmp.c

+3 −1
Original line number Diff line number Diff line
@@ -502,12 +502,14 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) 
	else if (!fl6.flowi6_oif)

		fl6.flowi6_oif = np->ucast_oif;



	ipc6.tclass = np->tclass;

	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = icmpv6_route_lookup(net, skb, sk, &fl6);

	if (IS_ERR(dst))

		goto out;



	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);

	ipc6.tclass = np->tclass;

	ipc6.dontfrag = np->dontfrag;

	ipc6.opt = NULL;

net/ipv6/ping.c

+3 −1
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	else if (!fl6.flowi6_oif)

		fl6.flowi6_oif = np->ucast_oif;



	ipc6.tclass = np->tclass;

	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = ip6_sk_dst_lookup_flow(sk, &fl6,  daddr);

	if (IS_ERR(dst))

		return PTR_ERR(dst);
@@ -140,7 +143,6 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	pfh.family = AF_INET6;



	ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);

	ipc6.tclass = np->tclass;

	ipc6.dontfrag = np->dontfrag;

	ipc6.opt = NULL;

net/ipv6/raw.c

+5 −3
Original line number Diff line number Diff line
@@ -878,6 +878,11 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (inet->hdrincl)

		fl6.flowi6_flags |= FLOWI_FLAG_KNOWN_NH;



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);
@@ -886,9 +891,6 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (ipc6.hlimit < 0)

		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	if (ipc6.dontfrag < 0)

		ipc6.dontfrag = np->dontfrag;

net/ipv6/route.c

+2 −0
Original line number Diff line number Diff line
@@ -3306,6 +3306,8 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) 


	err = -EINVAL;

	memset(&fl6, 0, sizeof(fl6));

	rtm = nlmsg_data(nlh);

	fl6.flowlabel = ip6_make_flowinfo(rtm->rtm_tos, 0);



	if (tb[RTA_SRC]) {

		if (nla_len(tb[RTA_SRC]) < sizeof(struct in6_addr))

net/ipv6/udp.c

+5 −3
Original line number Diff line number Diff line
@@ -1246,6 +1246,11 @@ do_udp_sendmsg: 


	security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p);

	if (IS_ERR(dst)) {

		err = PTR_ERR(dst);
@@ -1256,9 +1261,6 @@ do_udp_sendmsg: 
	if (ipc6.hlimit < 0)

		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	if (msg->msg_flags&MSG_CONFIRM)

		goto do_confirm;

back_from_confirm:

CRA Git | Maintained and supported by SUSTech CRA and CCSE