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

Santize dump payload: fix invalid listpack entry start with EOF (#9889)

Browse Source 
When an invalid listpack entry starts with EOF, we will skip it when we verify it in the loop.
This commit is contained in:
sundb 2021-12-04 22:43:08 +08:00 committed by GitHub
parent 64f6159646
commit 1808618f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/listpack.c
View File

@ -1318,6 +1318,10 @@ int lpValidateIntegrity(unsigned char *lp, size_t size, int deep,
count++; count++;
} }
/* Make sure 'p' really does point to the end of the listpack. */
if (p != lp + size - 1)
return 0;
/* Check that the count in the header is correct */ /* Check that the count in the header is correct */
if (numele != LP_HDR_NUMELE_UNKNOWN && numele != count) if (numele != LP_HDR_NUMELE_UNKNOWN && numele != count)
return 0; return 0;

9
tests/integration/corrupt-dump.tcl
View File

@ -118,6 +118,15 @@ test {corrupt payload: quicklist encoded_len is 0} {
} }
} }
test {corrupt payload: quicklist listpack entry start with EOF} {
start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
r config set sanitize-dump-payload yes
catch { r restore _list 0 "\x12\x01\x02\x0b\x0b\x00\x00\x00\x01\x00\x81\x61\x02\xff\xff\x0a\x00\x7e\xd8\xde\x5b\x0d\xd7\x70\xb8" replace } err
assert_match "*Bad data format*" $err
r ping
}
}
test {corrupt payload: #3080 - ziplist} { test {corrupt payload: #3080 - ziplist} {
start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] { start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
# shallow sanitization is enough for restore to safely reject the payload with wrong size # shallow sanitization is enough for restore to safely reject the payload with wrong size