rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 02:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

rainescript: set/unset statement do not check variable name validity

Browse Source 
Only JSON-based variables can be use with set and unset. Unfortunately,
this restriction is not checked. If an invalid variable is given
(e.g. $invalid), this is not detected upon config processing on
startup. During execution phase, this can lead to a segfault, a
memory leak or other types of problems.

see also https://github.com/rsyslog/rsyslog/issues/1376
closes https://github.com/rsyslog/rsyslog/issues/1377
This commit is contained in:
Rainer Gerhards 2017-01-24 13:24:29 +01:00
parent 026cfbef3b
commit e2767839bc
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
grammar/rainerscript.c
View File

@ -3062,6 +3062,19 @@ cnfstmtNew(unsigned s_type)
return cnfstmt;
}
/* This function disables a cnfstmt by setting it to NOP. This is
* useful when we detect errors late in the parsing processing, where
* we need to return a valid cnfstmt. The optimizer later removes the
* NOPs, so all is well.
* NOTE: this call assumes that no dynamic data structures have been
* allocated. If so, these MUST be freed before calling cnfstmtDisable().
*/
static void
cnfstmtDisable(struct cnfstmt *cnfstmt)
{
cnfstmt->nodetype = S_NOP;
}
void cnfstmtDestructLst(struct cnfstmt *root);
static void cnfIteratorDestruct(struct cnfitr *itr);
@ -3166,11 +3179,22 @@ cnfIteratorDestruct(struct cnfitr *itr)
struct cnfstmt *
cnfstmtNewSet(char *var, struct cnfexpr *expr, int force_reset)
{
propid_t propid;
struct cnfstmt* cnfstmt;
if((cnfstmt = cnfstmtNew(S_SET)) != NULL) {
cnfstmt->d.s_set.varname = (uchar*) var;
cnfstmt->d.s_set.expr = expr;
cnfstmt->d.s_set.force_reset = force_reset;
if(propNameToID((uchar *)var, &propid) == RS_RET_OK
&& ( propid == PROP_CEE
|| propid == PROP_LOCAL_VAR
|| propid == PROP_GLOBAL_VAR)
) {
cnfstmt->d.s_set.varname = (uchar*) var;
cnfstmt->d.s_set.expr = expr;
cnfstmt->d.s_set.force_reset = force_reset;
} else {
parser_errmsg("invalid variable '%s' in set statement.", var);
free(var);
cnfstmtDisable(cnfstmt);
}
}
return cnfstmt;
}
@ -3254,9 +3278,20 @@ cnfstmtNewReloadLookupTable(struct cnffparamlst *fparams)
struct cnfstmt *
cnfstmtNewUnset(char *var)
{
propid_t propid;
struct cnfstmt* cnfstmt;
if((cnfstmt = cnfstmtNew(S_UNSET)) != NULL) {
cnfstmt->d.s_unset.varname = (uchar*) var;
if(propNameToID((uchar *)var, &propid) == RS_RET_OK
&& ( propid == PROP_CEE
|| propid == PROP_LOCAL_VAR
|| propid == PROP_GLOBAL_VAR)
) {
cnfstmt->d.s_unset.varname = (uchar*) var;
} else {
parser_errmsg("invalid variable '%s' in unset statement.", var);
free(var);
cnfstmtDisable(cnfstmt);
}
}
return cnfstmt;
}