From: Sasha Levin <sashal@kernel•org>
To: linux-kernel@vger•kernel.org, stable@vger•kernel.org
Cc: David Ahern <dsahern@gmail•com>,
Mike Manning <mmanning@vyatta•att-mail.com>,
"David S . Miller" <davem@davemloft•net>,
Sasha Levin <sashal@kernel•org>,
netdev@vger•kernel.org
Subject: [PATCH AUTOSEL 4.20 179/304] ipv6: Fix handling of LLA with VRF and sockets bound to VRF
Date: Mon, 28 Jan 2019 10:41:36 -0500 [thread overview]
Message-ID: <20190128154341.47195-179-sashal@kernel.org> (raw)
In-Reply-To: <20190128154341.47195-1-sashal@kernel.org>
From: David Ahern <dsahern@gmail•com>
[ Upstream commit c2027d1e17582903e368abf5d4838b22a98f2b7b ]
A recent commit allows sockets bound to a VRF to receive ipv6 link local
packets. However, it only works for UDP and worse TCP connection attempts
to the LLA with the only listener bound to the VRF just hang where as
before the client gets a reset and connection refused. Fix by adjusting
ir_iif for LL addresses and packets received through a device enslaved
to a VRF.
Fixes: 6f12fa775530 ("vrf: mark skb for multicast or link-local as enslaved to VRF")
Reported-by: Donald Sharp <sharpd@cumulusnetworks•com>
Cc: Mike Manning <mmanning@vyatta•att-mail.com>
Signed-off-by: David Ahern <dsahern@gmail•com>
Signed-off-by: David S. Miller <davem@davemloft•net>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
net/ipv6/tcp_ipv6.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 03e6b7a2bc53..f5c213001b05 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -734,6 +734,7 @@ static void tcp_v6_init_req(struct request_sock *req,
const struct sock *sk_listener,
struct sk_buff *skb)
{
+ bool l3_slave = ipv6_l3mdev_skb(TCP_SKB_CB(skb)->header.h6.flags);
struct inet_request_sock *ireq = inet_rsk(req);
const struct ipv6_pinfo *np = inet6_sk(sk_listener);
@@ -741,7 +742,7 @@ static void tcp_v6_init_req(struct request_sock *req,
ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;
/* So that link locals have meaning */
- if (!sk_listener->sk_bound_dev_if &&
+ if ((!sk_listener->sk_bound_dev_if || l3_slave) &&
ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)
ireq->ir_iif = tcp_v6_iif(skb);
--
2.19.1
next prev parent reply other threads:[~2019-01-28 15:52 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190128154341.47195-1-sashal@kernel.org>
2019-01-28 15:38 ` [PATCH AUTOSEL 4.20 015/304] wil6210: fix reset flow for Talyn-mb Sasha Levin
2019-01-28 15:38 ` [PATCH AUTOSEL 4.20 016/304] wil6210: fix memory leak in wil_find_tx_bcast_2 Sasha Levin
2019-01-28 15:38 ` [PATCH AUTOSEL 4.20 017/304] ath10k: assign 'n_cipher_suites' for WCN3990 Sasha Levin
2019-01-28 15:38 ` [PATCH AUTOSEL 4.20 018/304] ath9k: dynack: use authentication messages for 'late' ack Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 030/304] bpftool: Improve handling of ENOENT on map dumps Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 036/304] ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 038/304] dpaa2-ptp: defer probe when portal allocation failed Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 039/304] sctp: Fix SKB list traversal in sctp_intl_store_ordered() Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 040/304] sctp: Fix SKB list traversal in sctp_intl_store_reasm() Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 041/304] iwlwifi: fw: do not set sgi bits for HE connection Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 048/304] i40e: suppress bogus error message Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 049/304] i40e: prevent overlapping tx_timeout recover Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 052/304] usbnet: smsc95xx: fix rx packet alignment Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 057/304] bpf: libbpf: retry map creation without the name Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 058/304] net/mlx5: EQ, Use the right place to store/read IRQ affinity hint Sasha Levin
2019-01-28 15:39 ` [PATCH AUTOSEL 4.20 076/304] ptp: Fix pass zero to ERR_PTR() in ptp_clock_register Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 092/304] net: aquantia: return 'err' if set MPI_DEINIT state fails Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 104/304] mt76x0: dfs: fix IBI_R11 configuration on non-radar channels Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 105/304] mt76x0: use band parameter for LC calibration Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 109/304] nfp: add locking around representor changes Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 127/304] mac80211: fix deauth TX when we disconnect Sasha Levin
2019-01-28 15:40 ` [PATCH AUTOSEL 4.20 130/304] tipc: fix node keep alive interval calculation Sasha Levin
2019-01-28 15:41 ` [PATCH AUTOSEL 4.20 169/304] mlxsw: spectrum_acl: Limit priority value Sasha Levin
2019-01-28 15:41 ` [PATCH AUTOSEL 4.20 172/304] selftests/bpf: use __bpf_constant_htons in test_prog.c Sasha Levin
2019-01-28 15:41 ` Sasha Levin [this message]
2019-01-28 15:41 ` [PATCH AUTOSEL 4.20 180/304] tools: bpftool: fix -Wmissing declaration warnings Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 203/304] bnxt_en: Disable MSIX before re-reserving NQs/CMPL rings Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 207/304] mac80211: Properly handle SKB with radiotap only Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 216/304] net: hns3: fix error handling int the hns3_get_vector_ring_chain Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 217/304] net: hns3: fix incomplete uninitialization of IRQ in the hns3_nic_uninit_vector_data() Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 223/304] mac80211: fix radiotap vendor presence bitmap handling Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 224/304] xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 225/304] mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 229/304] cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan() Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 230/304] net: hns3: add max vector number check for pf Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 231/304] net: hns3: fix the descriptor index when get rss type Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 232/304] net: hns3: don't restore rules when flow director is disabled Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 234/304] iwlwifi: mvm: fix setting HE ppe FW config Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 236/304] mlx5: update timecounter at least twice per counter overflow Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 241/304] ath10k: fix kernel panic due to use after free Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 242/304] ath10k: fix tx_stats memory leak Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 247/304] i40e: define proper net_device::neigh_priv_len Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 248/304] ice: Do not enable NAPI on q_vectors that have no rings Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 249/304] igb: Fix an issue that PME is not enabled during runtime suspend Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 252/304] bpf: sk_msg, zap ingress queue on psock down Sasha Levin
2019-01-28 15:42 ` [PATCH AUTOSEL 4.20 254/304] bpf: sk_msg, fix socket data_ready events Sasha Levin
2019-01-28 15:43 ` [PATCH AUTOSEL 4.20 272/304] niu: fix missing checks of niu_pci_eeprom_read Sasha Levin
2019-01-28 15:43 ` [PATCH AUTOSEL 4.20 283/304] isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug in HFCPCI_l1hw() Sasha Levin
2019-01-28 15:43 ` [PATCH AUTOSEL 4.20 285/304] fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address() Sasha Levin
2019-01-28 15:43 ` [PATCH AUTOSEL 4.20 293/304] bpf: fix check_map_access smin_value test when pointer contains offset Sasha Levin
2019-01-28 15:43 ` [PATCH AUTOSEL 4.20 304/304] xprtrdma: Don't wake pending tasks until disconnect is done Sasha Levin
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=20190128154341.47195-179-sashal@kernel.org \
--to=sashal@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mmanning@vyatta$(echo .)att-mail.com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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