Commit 8f241ab3 authored by meir@redislabs.com's avatar meir@redislabs.com Committed by Oran Agra
Browse files

Fix invalid memory write on lua stack overflow {CVE-2021-32626}

When LUA call our C code, by default, the LUA stack has room for 20
elements. In most cases, this is more than enough but sometimes it's not
and the caller must verify the LUA stack size before he pushes elements.

On 3 places in the code, there was no verification of the LUA stack size.
On specific inputs this missing verification could have lead to invalid
memory write:
1. On 'luaReplyToRedisReply', one might return a nested reply that will
   explode the LUA stack.
2. On 'redisProtocolToLuaType', the Redis reply might be deep enough
   to explode the LUA stack (notice that currently there is no such
   command in Redis that returns such a nested reply, but modules might
   do it)
3. On 'ldbRedis', one might give a command with enough arguments to
   explode the LUA stack (all the arguments will be pushed to the LUA
   stack)

This commit is solving all those 3 issues by calling 'lua_checkstack' and
verify that there is enough room in the LUA stack to push elements. In
case 'lua_checkstack' returns an error (there is not enough room in the
LUA stack and it's not possible to increase the stack), we will do the
following:
1. On 'luaReplyToRedisReply', we will return an error to the user.
2. On 'redisProtocolToLuaType' we will exit with panic (we assume this
   scenario is rare because it can only happen with a module).
3. On 'ldbRedis', we return an error.
parent 3e09be56
...@@ -129,6 +129,16 @@ void sha1hex(char *digest, char *script, size_t len) { ...@@ -129,6 +129,16 @@ void sha1hex(char *digest, char *script, size_t len) {
*/ */
char *redisProtocolToLuaType(lua_State *lua, char* reply) { char *redisProtocolToLuaType(lua_State *lua, char* reply) {
if (!lua_checkstack(lua, 5)) {
/*
* Increase the Lua stack if needed, to make sure there is enough room
* to push 5 elements to the stack. On failure, exit with panic.
         * Notice that we need, in the worst case, 5 elements because redisProtocolToLuaType_Aggregate
         * might push 5 elements to the Lua stack.*/
serverPanic("lua stack limit reach when parsing redis.call reply");
}
char *p = reply; char *p = reply;
switch(*p) { switch(*p) {
...@@ -221,6 +231,11 @@ char *redisProtocolToLuaType_Aggregate(lua_State *lua, char *reply, int atype) { ...@@ -221,6 +231,11 @@ char *redisProtocolToLuaType_Aggregate(lua_State *lua, char *reply, int atype) {
if (atype == '%') { if (atype == '%') {
p = redisProtocolToLuaType(lua,p); p = redisProtocolToLuaType(lua,p);
} else { } else {
if (!lua_checkstack(lua, 1)) {
/* Notice that here we need to check the stack again because the recursive
* call to redisProtocolToLuaType might have use the room allocated in the stack */
serverPanic("lua stack limit reach when parsing redis.call reply");
}
lua_pushboolean(lua,1); lua_pushboolean(lua,1);
} }
lua_settable(lua,-3); lua_settable(lua,-3);
...@@ -340,6 +355,17 @@ void luaSortArray(lua_State *lua) { ...@@ -340,6 +355,17 @@ void luaSortArray(lua_State *lua) {
/* Reply to client 'c' converting the top element in the Lua stack to a /* Reply to client 'c' converting the top element in the Lua stack to a
* Redis reply. As a side effect the element is consumed from the stack. */ * Redis reply. As a side effect the element is consumed from the stack. */
void luaReplyToRedisReply(client *c, lua_State *lua) { void luaReplyToRedisReply(client *c, lua_State *lua) {
if (!lua_checkstack(lua, 4)) {
/* Increase the Lua stack if needed to make sure there is enough room
* to push 4 elements to the stack. On failure, return error.
         * Notice that we need, in the worst case, 4 elements because returning a map might
* require push 4 elements to the Lua stack.*/
addReplyErrorFormat(c, "reached lua stack limit");
lua_pop(lua,1); /* pop the element from the stack */
return;
}
int t = lua_type(lua,-1); int t = lua_type(lua,-1);
switch(t) { switch(t) {
...@@ -363,6 +389,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) { ...@@ -363,6 +389,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) {
* field. */ * field. */
/* Handle error reply. */ /* Handle error reply. */
/* we took care of the stack size on function start */
lua_pushstring(lua,"err"); lua_pushstring(lua,"err");
lua_gettable(lua,-2); lua_gettable(lua,-2);
t = lua_type(lua,-1); t = lua_type(lua,-1);
...@@ -405,6 +432,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) { ...@@ -405,6 +432,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) {
if (t == LUA_TTABLE) { if (t == LUA_TTABLE) {
int maplen = 0; int maplen = 0;
void *replylen = addReplyDeferredLen(c); void *replylen = addReplyDeferredLen(c);
/* we took care of the stack size on function start */
lua_pushnil(lua); /* Use nil to start iteration. */ lua_pushnil(lua); /* Use nil to start iteration. */
while (lua_next(lua,-2)) { while (lua_next(lua,-2)) {
/* Stack now: table, key, value */ /* Stack now: table, key, value */
...@@ -427,6 +455,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) { ...@@ -427,6 +455,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) {
if (t == LUA_TTABLE) { if (t == LUA_TTABLE) {
int setlen = 0; int setlen = 0;
void *replylen = addReplyDeferredLen(c); void *replylen = addReplyDeferredLen(c);
/* we took care of the stack size on function start */
lua_pushnil(lua); /* Use nil to start iteration. */ lua_pushnil(lua); /* Use nil to start iteration. */
while (lua_next(lua,-2)) { while (lua_next(lua,-2)) {
/* Stack now: table, key, true */ /* Stack now: table, key, true */
...@@ -446,6 +475,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) { ...@@ -446,6 +475,7 @@ void luaReplyToRedisReply(client *c, lua_State *lua) {
void *replylen = addReplyDeferredLen(c); void *replylen = addReplyDeferredLen(c);
int j = 1, mbulklen = 0; int j = 1, mbulklen = 0;
while(1) { while(1) {
/* we took care of the stack size on function start */
lua_pushnumber(lua,j++); lua_pushnumber(lua,j++);
lua_gettable(lua,-2); lua_gettable(lua,-2);
t = lua_type(lua,-1); t = lua_type(lua,-1);
...@@ -2561,6 +2591,17 @@ void ldbEval(lua_State *lua, sds *argv, int argc) { ...@@ -2561,6 +2591,17 @@ void ldbEval(lua_State *lua, sds *argv, int argc) {
void ldbRedis(lua_State *lua, sds *argv, int argc) { void ldbRedis(lua_State *lua, sds *argv, int argc) {
int j, saved_rc = server.lua_replicate_commands; int j, saved_rc = server.lua_replicate_commands;
if (!lua_checkstack(lua, argc + 1)) {
/* Increase the Lua stack if needed to make sure there is enough room
* to push 'argc + 1' elements to the stack. On failure, return error.
         * Notice that we need, in worst case, 'argc + 1' elements because we push all the arguments
         * given by the user (without the first argument) and we also push the 'redis' global table and
         * 'redis.call' function so:
         * (1 (redis table)) + (1 (redis.call function)) + (argc - 1 (all arguments without the first)) = argc + 1*/
ldbLogRedisReply("max lua stack reached");
return;
}
lua_getglobal(lua,"redis"); lua_getglobal(lua,"redis");
lua_pushstring(lua,"call"); lua_pushstring(lua,"call");
lua_gettable(lua,-2); /* Stack: redis, redis.call */ lua_gettable(lua,-2); /* Stack: redis, redis.call */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment