Module Name: src
Committed By: ozaki-r
Date: Wed Sep 5 02:49:41 UTC 2018
Modified Files:
src/sys/net: route.c
Log Message:
route: avoid overwriting rt_free_global.enqueued unexpectedly
rt_free_global.enqueued can be set to true by rt_free during rt_free_work
because rt_free_work releases rt_free_global.lock. So rt_free_work must update
it once and not update after releasing the lock.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/net/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.212 src/sys/net/route.c:1.213
--- src/sys/net/route.c:1.212 Wed Sep 5 02:49:09 2018
+++ src/sys/net/route.c Wed Sep 5 02:49:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.212 2018/09/05 02:49:09 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.213 2018/09/05 02:49:40 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.212 2018/09/05 02:49:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.213 2018/09/05 02:49:40 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -702,8 +702,8 @@ rt_free_work(struct work *wk, void *arg)
struct rtentry *rt;
mutex_enter(&rt_free_global.lock);
- rt_free_global.enqueued = false;
if ((rt = SLIST_FIRST(&rt_free_global.queue)) == NULL) {
+ rt_free_global.enqueued = false;
mutex_exit(&rt_free_global.lock);
return;
}
