gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integer Overflow in RAND commands can lead to assertion (CVE-2023-25155) (#11857)

Browse Source 
Issue happens when passing a negative long value that greater than
the max positive value that the long can store.
This commit is contained in:
Oran Agra 2023-02-28 15:15:46 +02:00 committed by Malavan Sotheeswaran
parent 1735e73a35
commit d4c0a970e7
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/t_hash.cpp
View File

@ -1221,13 +1221,13 @@ void hrandfieldCommand(client *c) {
ziplistEntry ele; ziplistEntry ele;
if (c->argc >= 3) { if (c->argc >= 3) {
if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return; if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
if (c->argc > 4 || (c->argc == 4 && strcasecmp(szFromObj(c->argv[3]),"withvalues"))) { if (c->argc > 4 || (c->argc == 4 && strcasecmp(c->argv[3]->ptr,"withvalues"))) {
addReplyErrorObject(c,shared.syntaxerr); addReplyErrorObject(c,shared.syntaxerr);
return; return;
} else if (c->argc == 4) { } else if (c->argc == 4) {
withvalues = 1; withvalues = 1;
if (l < LONG_MIN/2 || l > LONG_MAX/2) { if (l < -LONG_MAX/2 || l > LONG_MAX/2) {
addReplyError(c,"value is out of range"); addReplyError(c,"value is out of range");
return; return;
} }

2
src/t_set.cpp
View File

@ -672,7 +672,7 @@ void srandmemberWithCountCommand(client *c) {
dict *d; dict *d;
if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return; if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
if (l >= 0) { if (l >= 0) {
count = (unsigned long) l; count = (unsigned long) l;
} else { } else {

6
src/t_zset.cpp
View File

@ -4210,13 +4210,13 @@ void zrandmemberCommand(client *c) {
ziplistEntry ele; ziplistEntry ele;
if (c->argc >= 3) { if (c->argc >= 3) {
if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return; if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
if (c->argc > 4 || (c->argc == 4 && strcasecmp(szFromObj(c->argv[3]),"withscores"))) { if (c->argc > 4 || (c->argc == 4 && strcasecmp(c->argv[3]->ptr,"withscores"))) {
addReplyErrorObject(c,shared.syntaxerr); addReplyErrorObject(c,shared.syntaxerr);
return; return;
} else if (c->argc == 4) { } else if (c->argc == 4) {
withscores = 1; withscores = 1;
if (l < LONG_MIN/2 || l > LONG_MAX/2) { if (l < -LONG_MAX/2 || l > LONG_MAX/2) {
addReplyError(c,"value is out of range"); addReplyError(c,"value is out of range");
return; return;
} }

2
tests/unit/type/hash.tcl
View File

@ -71,6 +71,8 @@ start_server {tags {"hash"}} {
test "HRANDFIELD count overflow" { test "HRANDFIELD count overflow" {
r hmset myhash a 1 r hmset myhash a 1
assert_error {*value is out of range*} {r hrandfield myhash -9223372036854770000 withvalues} assert_error {*value is out of range*} {r hrandfield myhash -9223372036854770000 withvalues}
assert_error {*value is out of range*} {r hrandfield myhash -9223372036854775808 withvalues}
assert_error {*value is out of range*} {r hrandfield myhash -9223372036854775808}
} {} } {}
test "HRANDFIELD with <count> against non existing key" { test "HRANDFIELD with <count> against non existing key" {

5
tests/unit/type/set.tcl
View File

@ -588,6 +588,11 @@ start_server {
r srandmember nonexisting_key 100 r srandmember nonexisting_key 100
} {} } {}
test "SRANDMEMBER count overflow" {
r sadd myset a
assert_error {*value is out of range*} {r srandmember myset -9223372036854775808}
} {}
# Make sure we can distinguish between an empty array and a null response # Make sure we can distinguish between an empty array and a null response
r readraw 1 r readraw 1

2
tests/unit/type/zset.tcl
View File

@ -1717,6 +1717,8 @@ start_server {tags {"zset"}} {
test "ZRANDMEMBER count overflow" { test "ZRANDMEMBER count overflow" {
r zadd myzset 0 a r zadd myzset 0 a
assert_error {*value is out of range*} {r zrandmember myzset -9223372036854770000 withscores} assert_error {*value is out of range*} {r zrandmember myzset -9223372036854770000 withscores}
assert_error {*value is out of range*} {r zrandmember myzset -9223372036854775808 withscores}
assert_error {*value is out of range*} {r zrandmember myzset -9223372036854775808}
} {} } {}
# Make sure we can distinguish between an empty array and a null response # Make sure we can distinguish between an empty array and a null response