]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: possible use after free in dst_release
authorFrancesco Ruggeri <fruggeri@aristanetworks.com>
Wed, 6 Jan 2016 08:18:48 +0000 (00:18 -0800)
committerJiri Slaby <jslaby@suse.cz>
Mon, 6 Feb 2017 08:05:40 +0000 (09:05 +0100)
commit 07a5d38453599052aff0877b16bb9c1585f08609 upstream.

dst_release should not access dst->flags after decrementing
__refcnt to 0. The dst_entry may be in dst_busy_list and
dst_gc_task may dst_destroy it before dst_release gets a chance
to access dst->flags.

Fixes: d69bbf88c8d0 ("net: fix a race in dst_release()")
Fixes: 27b75c95f10d ("net: avoid RCU for NOCACHE dst")
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/core/dst.c

index 31344009de253042e09461287fba1a8dac8d1235..08c9a8f7b8856bbba5b34b12f995d15dfaa39800 100644 (file)
@@ -280,12 +280,13 @@ void dst_release(struct dst_entry *dst)
 {
        if (dst) {
                int newrefcnt;
+               unsigned short nocache = dst->flags & DST_NOCACHE;
 
                newrefcnt = atomic_dec_return(&dst->__refcnt);
                if (unlikely(newrefcnt < 0))
                        net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
                                             __func__, dst, newrefcnt);
-               if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE))
+               if (!newrefcnt && unlikely(nocache))
                        call_rcu(&dst->rcu_head, dst_destroy_rcu);
        }
 }