mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-04 22:51:26 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: hlua: Lock pattern references to perform set/add/del operations

Browse Source 
The pattern references lock must be hold to perform set/add/del
operations. Unfortunately, it is not true for the lua functions manipulating acl
and map files.

This patch should fix the issue #664. It must be backported as far as 1.8.
This commit is contained in:
Christopher Faulet 2020-06-03 18:39:16 +02:00
parent 7c26ed73f7
commit 5cf2dfc5fd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -1258,7 +1258,9 @@ __LJMP static int hlua_del_acl(lua_State *L)
if (!ref)
WILL_LJMP(luaL_error(L, "'del_acl': unknown acl file '%s'", name));
HA_SPIN_LOCK(PATREF_LOCK, &ref->lock);
pat_ref_delete(ref, key);
HA_SPIN_UNLOCK(PATREF_LOCK, &ref->lock);
return 0;
}
@ -1280,7 +1282,9 @@ static int hlua_del_map(lua_State *L)
if (!ref)
WILL_LJMP(luaL_error(L, "'del_map': unknown acl file '%s'", name));
HA_SPIN_LOCK(PATREF_LOCK, &ref->lock);
pat_ref_delete(ref, key);
HA_SPIN_UNLOCK(PATREF_LOCK, &ref->lock);
return 0;
}
@ -1302,8 +1306,10 @@ static int hlua_add_acl(lua_State *L)
if (!ref)
WILL_LJMP(luaL_error(L, "'add_acl': unknown acl file '%s'", name));
HA_SPIN_LOCK(PATREF_LOCK, &ref->lock);
if (pat_ref_find_elt(ref, key) == NULL)
pat_ref_add(ref, key, NULL, NULL);
HA_SPIN_UNLOCK(PATREF_LOCK, &ref->lock);
return 0;
}
@ -1328,10 +1334,12 @@ static int hlua_set_map(lua_State *L)
if (!ref)
WILL_LJMP(luaL_error(L, "'set_map': unknown map file '%s'", name));
HA_SPIN_LOCK(PATREF_LOCK, &ref->lock);
if (pat_ref_find_elt(ref, key) != NULL)
pat_ref_set(ref, key, value, NULL);
else
pat_ref_add(ref, key, value, NULL);
HA_SPIN_UNLOCK(PATREF_LOCK, &ref->lock);
return 0;
}