rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2026-08-24 19:24:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: imuxsock segfault when system log socket was used

Browse Source
This commit is contained in:
Rainer Gerhards 2013-02-27 18:19:52 +01:00
parent 84d9283b9f
commit 34a77cde24
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ Version 7.3.7 [devel] 2013-02-??
if omjournal is used together with traditional syslog. if omjournal is used together with traditional syslog.
- field() function now supports a string as field delimiter - field() function now supports a string as field delimiter
- added ability to configure debug system via rsyslog.conf - added ability to configure debug system via rsyslog.conf
- bugfix: imuxsock segfault when system log socket was used
- bugfix: mmjsonparse segfault if new-style config was used - bugfix: mmjsonparse segfault if new-style config was used
- bugfix: script == comparison did not work properly on JSON objects - bugfix: script == comparison did not work properly on JSON objects
- bugfix: field() function did never return "***FIELD NOT FOUND***" - bugfix: field() function did never return "***FIELD NOT FOUND***"

14
plugins/imuxsock/imuxsock.c
View File

@ -716,7 +716,7 @@ copyescaped(uchar *dstbuf, uchar *inbuf, int inlen)
* can also mangle it if necessary. * can also mangle it if necessary.
*/ */
static inline rsRetVal static inline rsRetVal
SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct timeval *ts, sbool bDiscardOwnMsgs) SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct timeval *ts)
{ {
msg_t *pMsg; msg_t *pMsg;
int lenMsg; int lenMsg;
@ -739,8 +739,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
struct json_object *json = NULL, *jval; struct json_object *json = NULL, *jval;
DEFiRet; DEFiRet;
dbgprintf("DDDD: cred->pid %d, ourPid %d\n", cred->pid, glblGetOurPid()); if(pLstn->bDiscardOwnMsgs && cred != NULL && cred->pid == glblGetOurPid()) {
if(bDiscardOwnMsgs && cred != NULL && cred->pid == glblGetOurPid()) {
DBGPRINTF("imuxsock: discarding message from our own pid\n"); DBGPRINTF("imuxsock: discarding message from our own pid\n");
FINALIZE; FINALIZE;
} }
@ -996,7 +995,7 @@ static rsRetVal readSocket(lstn_t *pLstn)
# endif /* HAVE_SO_TIMESTAMP */ # endif /* HAVE_SO_TIMESTAMP */
} }
} }
CHKiRet(SubmitMsg(pRcv, iRcvd, pLstn, cred, ts, pLstn->bDiscardOwnMsgs)); CHKiRet(SubmitMsg(pRcv, iRcvd, pLstn, cred, ts));
} else if(iRcvd < 0 && errno != EINTR && errno != EAGAIN) { } else if(iRcvd < 0 && errno != EINTR && errno != EAGAIN) {
char errStr[1024]; char errStr[1024];
rs_strerror_r(errno, errStr, sizeof(errStr)); rs_strerror_r(errno, errStr, sizeof(errStr));
@ -1494,6 +1493,13 @@ CODEmodInit_QueryRegCFSLineHdlr
listeners[0].bDiscardOwnMsgs = 1; listeners[0].bDiscardOwnMsgs = 1;
listeners[0].bCreatePath = 0; listeners[0].bCreatePath = 0;
listeners[0].bUseSysTimeStamp = 1; listeners[0].bUseSysTimeStamp = 1;
if((listeners[0].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn,
(void(*)(void*))ratelimitDestruct)) == NULL) {
/* in this case, we simply turn off rate-limiting */
DBGPRINTF("imuxsock: turning off rate limiting for system socket "
"because we could not create hash table\n");
listeners[0].ratelimitInterval = 0;
}
/* initialize socket names */ /* initialize socket names */
for(i = 1 ; i < MAXFUNIX ; ++i) { for(i = 1 ; i < MAXFUNIX ; ++i) {