Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 339e3cbf authored by Guillaume Nault's avatar Guillaume Nault Committed by Greg Kroah-Hartman
Browse files

libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route() 



commit a915deaa9abe4fb3a440312c954253a6a733608e upstream.

Mask the ECN bits before calling ip_route_output_ports(). The tos
variable might be passed directly from an IPv4 header, so it may have
the last ECN bit set. This interferes with the route lookup process as
ip_route_output_key_hash() interpretes this bit specially (to restrict
the route scope).

Found by code inspection, compile tested only.

Fixes: 804c2f3e ("libcxgb,iw_cxgb4,cxgbit: add cxgb_find_route()")
Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4048cedf

drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <linux/tcp.h>

#include <linux/ipv6.h>

#include <net/inet_ecn.h>

#include <net/route.h>

#include <net/ip6_route.h>
@@ -99,7 +100,7 @@ cxgb_find_route(struct cxgb4_lld_info *lldi, 


	rt = ip_route_output_ports(&init_net, &fl4, NULL, peer_ip, local_ip,

				   peer_port, local_port, IPPROTO_TCP,

				   tos, 0);

				   tos & ~INET_ECN_MASK, 0);

	if (IS_ERR(rt))

		return NULL;

	n = dst_neigh_lookup(&rt->dst, &peer_ip);