Skip to content

Commit c64a072

Browse files
IurmanJPaolo Abeni
authored andcommitted
net: ipv6: fix dst ref loop on input in seg6 lwt
Prevent a dst ref loop on input in seg6_iptunnel. Fixes: af4a220 ("ipv6: sr: use dst_cache in seg6_input") Cc: David Lebrun <dlebrun@google.com> Cc: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Signed-off-by: Justin Iurman <justin.iurman@uliege.be> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 1cf9631 commit c64a072

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

net/ipv6/seg6_iptunnel.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,18 @@ static int seg6_input_core(struct net *net, struct sock *sk,
472472
{
473473
struct dst_entry *orig_dst = skb_dst(skb);
474474
struct dst_entry *dst = NULL;
475+
struct lwtunnel_state *lwtst;
475476
struct seg6_lwt *slwt;
476477
int err;
477478

478-
slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);
479+
/* We cannot dereference "orig_dst" once ip6_route_input() or
480+
* skb_dst_drop() is called. However, in order to detect a dst loop, we
481+
* need the address of its lwtstate. So, save the address of lwtstate
482+
* now and use it later as a comparison.
483+
*/
484+
lwtst = orig_dst->lwtstate;
485+
486+
slwt = seg6_lwt_lwtunnel(lwtst);
479487

480488
local_bh_disable();
481489
dst = dst_cache_get(&slwt->cache);
@@ -490,7 +498,9 @@ static int seg6_input_core(struct net *net, struct sock *sk,
490498
if (!dst) {
491499
ip6_route_input(skb);
492500
dst = skb_dst(skb);
493-
if (!dst->error) {
501+
502+
/* cache only if we don't create a dst reference loop */
503+
if (!dst->error && lwtst != dst->lwtstate) {
494504
local_bh_disable();
495505
dst_cache_set_ip6(&slwt->cache, dst,
496506
&ipv6_hdr(skb)->saddr);

0 commit comments

Comments
 (0)