aboutsummaryrefslogtreecommitdiffstats
path: root/package/firewall
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-18 20:15:47 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-18 20:15:47 +0000
commitdd8ec17c9dbdf53026c77661d87592671efddf56 (patch)
tree0f17b5b26c4ef9065804a65777e29a0fc2e3855a /package/firewall
parentde85a5733d38e98f9765b9963ec859bafd1cb2cb (diff)
downloadupstream-dd8ec17c9dbdf53026c77661d87592671efddf56.tar.gz
upstream-dd8ec17c9dbdf53026c77661d87592671efddf56.tar.bz2
upstream-dd8ec17c9dbdf53026c77661d87592671efddf56.zip
[package] firewall: fix a possible deadlock when the firewall config has syntax errors during restart
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21501 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall')
-rw-r--r--package/firewall/files/lib/core.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index d0b87a770b..5f06ffe3fb 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -8,14 +8,15 @@ include /lib/network
fw_start() {
fw_init
- lock /var/lock/firewall.start
-
FW_DEFAULTS_APPLIED=
fw_is_loaded && {
echo "firewall already loaded" >&2
exit 1
}
+
+ lock /var/lock/firewall.start
+
uci_set_state firewall core "" firewall_state
fw_clear DROP
@@ -93,6 +94,7 @@ fw_die() {
echo "Error:" "$@" >&2
fw_log error "$@"
fw_stop
+ lock -u /var/lock/firewall.start
exit 1
}