db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00
Code Issues Releases Activity

Fix lower bounds checking for option keys.

Browse Source 
Specifying an indexed option with a key of 0, e.g. pg0-path, would lead to a segfault.

Add lower bounds checking to fix the issue.
This commit is contained in:
David Steele
2025-05-01 13:06:18 -04:00
parent 293bc2a75d
commit 5e01098617
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
doc/xml/release/2025/2.55.1.xml
View File

@@ -1,2 +1,19 @@
<release date="2025-05-05" version="2.55.1dev" title="Bug Fixes">
<release-core-list>
<release-bug-list>
<release-item>
<github-issue id="2610"/>
<github-pull-request id="2611"/>
<release-item-contributor-list>
<release-item-ideator id="wolfgang.walther"/>
<release-item-contributor id="david.steele"/>
<release-item-reviewer id="david.christensen"/>
<release-item-reviewer id="wolfgang.walther"/>
</release-item-contributor-list>
<p>Fix lower bounds checking for option keys.</p>
</release-item>
</release-bug-list>
</release-core-list>
</release>

5
doc/xml/release/contributor.xml
View File

@@ -1181,6 +1181,11 @@
<contributor-id type="github">mydimension</contributor-id>
</contributor>
<contributor id="wolfgang.walther">
<contributor-name-display>Wolfgang Walther</contributor-name-display>
<contributor-id type="github">wolfgangwalther</contributor-id>
</contributor>
<contributor id="wu.ning">
<contributor-name-display>Wu Ning</contributor-name-display>
<contributor-id type="github">50wu</contributor-id>

7
src/config/parse.c
View File

@@ -614,11 +614,12 @@ cfgParseOption(const String *const optionCandidate, const CfgParseOptionParam pa
optionNameSize -= (size_t)(dashPtr - numberPtr);
memmove(numberPtr, dashPtr, optionNameSize + 1);
// Check that the index does not exceed the maximum
if (result.keyIdx > CFG_OPTION_KEY_MAX)
// Check that the index is within bounds
if (result.keyIdx < 1 || result.keyIdx > CFG_OPTION_KEY_MAX)
{
THROW_FMT(
OptionInvalidError, "option '%s' key exceeds maximum of " STRINGIFY(CFG_OPTION_KEY_MAX), strZ(optionCandidate));
OptionInvalidError, "option '%s' key must be between 1 and " STRINGIFY(CFG_OPTION_KEY_MAX),
strZ(optionCandidate));
}
// Subtract one to represent a key index

14
test/src/module/config/parseTest.c
View File

@@ -821,14 +821,24 @@ testRun(void)
"option 'reset-force' cannot be reset");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("error if option exceeds key max");
TEST_TITLE("error if option less than key min");
argList = strLstNew();
strLstAddZ(argList, TEST_BACKREST_EXE);
strLstAddZ(argList, "--pg0-path=/dude");
TEST_ERROR(
cfgParseP(storageTest, strLstSize(argList), strLstPtr(argList), .noResetLogLevel = true), OptionInvalidError,
"option 'pg0-path' key must be between 1 and 256");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("error if option greater than key max");
argList = strLstNew();
strLstAddZ(argList, TEST_BACKREST_EXE);
strLstAddZ(argList, "--pg257-path");
TEST_ERROR(
cfgParseP(storageTest, strLstSize(argList), strLstPtr(argList), .noResetLogLevel = true), OptionInvalidError,
"option 'pg257-path' key exceeds maximum of 256");
"option 'pg257-path' key must be between 1 and 256");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("error if option begins with a number");