SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-varlink: check flags against the correct field

Browse Source 
Otherwise even a method without SD_VARLINK_SUPPORTS_MORE/REQUIRES_MORE
can emit "continues" replies without our IDL validation catching it.
This commit is contained in:
Frantisek Sumsal
2026-04-08 21:33:05 +01:00
committed by Luca Boccassi
parent a4b5985734
commit 1e551f0d96
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-varlink/sd-varlink-idl.c
+1 -1
View File
@@ -1955,7 +1955,7 @@ int varlink_idl_validate_method_reply(const sd_varlink_symbol *method, sd_json_v
return -EBADMSG;
/* If method replies have the "continues" flag set, but the method is not allowed to generate that, return a recognizable error */
if (FLAGS_SET(flags, SD_VARLINK_REPLY_CONTINUES) && (method->symbol_type & (SD_VARLINK_SUPPORTS_MORE|SD_VARLINK_REQUIRES_MORE)) == 0)
if (FLAGS_SET(flags, SD_VARLINK_REPLY_CONTINUES) && (method->symbol_flags & (SD_VARLINK_SUPPORTS_MORE|SD_VARLINK_REQUIRES_MORE)) == 0)
return -EBADE;
return varlink_idl_validate_symbol(method, v, SD_VARLINK_OUTPUT, reterr_bad_field);
src/test/test-varlink-idl.c
+42
View File
@@ -621,4 +621,46 @@ TEST(null_map_element) {
ASSERT_STREQ(bad_field, "m");
}
static SD_VARLINK_DEFINE_METHOD_FULL(
SupportsMoreMethod,
SD_VARLINK_SUPPORTS_MORE,
SD_VARLINK_DEFINE_OUTPUT(result, SD_VARLINK_STRING, 0));
TEST(reply_continues_with_more_flag) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
ASSERT_OK(sd_json_buildo(&v, SD_JSON_BUILD_PAIR_STRING("result", "hello")));
const char *bad_field = NULL;
ASSERT_OK(varlink_idl_validate_method_reply(
&vl_method_SupportsMoreMethod, v, SD_VARLINK_REPLY_CONTINUES, &bad_field));
ASSERT_NULL(bad_field);
ASSERT_OK(varlink_idl_validate_method_reply(
&vl_method_SupportsMoreMethod, v, /* flags= */ 0, &bad_field));
ASSERT_NULL(bad_field);
}
static SD_VARLINK_DEFINE_METHOD(
NoMoreMethod,
SD_VARLINK_DEFINE_OUTPUT(result, SD_VARLINK_STRING, 0));
TEST(reply_continues_without_more_flag) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
ASSERT_OK(sd_json_buildo(&v, SD_JSON_BUILD_PAIR_STRING("result", "hello")));
const char *bad_field = NULL;
/* Request a "continues" reply from a method without SD_VARLINK_SUPPORTS_MORE/REQUIRES_MORE - this
* should fail the validation with EBADE */
ASSERT_ERROR(varlink_idl_validate_method_reply(
&vl_method_NoMoreMethod, v, SD_VARLINK_REPLY_CONTINUES, &bad_field), EBADE);
ASSERT_NULL(bad_field);
/* Without the "continues" flag, validation should succeed */
ASSERT_OK(varlink_idl_validate_method_reply(
&vl_method_NoMoreMethod, v, /* flags= */ 0, &bad_field));
ASSERT_NULL(bad_field);
}
DEFINE_TEST_MAIN(LOG_DEBUG);