Diskq: Fix crash when corrupt disk-queue is read (during move) #1924
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gaborznagy
changed the title
|
success |
|
Build SUCCESS, the tests were executed on test branch: master and test suite: functions |
furiel
reviewed
Mar 21, 2018
| @@ -1852,6 +1852,8 @@ log_msg_lookup_time_stamp_name(const gchar *name) | |||
|
|
|||
| gssize log_msg_get_size(LogMessage *self) | |||
| { | |||
| if(!self) return 0; | |||
There was a problem hiding this comment.
I would prefer an assert here.
There was a problem hiding this comment.
I agree with your reason that a NULL is not a valid LogMessage, but I would not change it.
Using assert would lead an immediate crash which would be unnecessary if we can handle it gracefully.
- There is no valid LogMessage that would be evaluated to 0, therefore a 0 is always an error.
- If we would like to avoid syslog-ng crashes and assert would be preferred then each
log_msg_get_sizecall should be guarded. Of course with returning 0 then the user oflog_msg_get_sizeshould make the error handling.
There was a problem hiding this comment.
Thanks for explaining, fine for me
gaborznagy
force-pushed
the
diskq-fix-move-disk
branch
from
eea735e
to
8b070c1
Compare
added 2 commits
March 22, 2018 09:51
Signed-off-by: Gabor Nagy <gabor.nagy@balabit.com>
Signed-off-by: Gabor Nagy <gabor.nagy@balabit.com>
gaborznagy
force-pushed
the
diskq-fix-move-disk
branch
from
8b070c1
to
7d0a645
Compare
furiel
approved these changes
Mar 22, 2018
|
Build SUCCESS, the tests were executed on test branch: master and test suite: functions |
|
success |
Kokan
approved these changes
Mar 23, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After fixing the restart functionality of disk-queue (see PR #1886) our test cases found another bug in non-reliable disk-queue.
After a successful message pop from disk-queue (either from qout or from overflow buffer or from the disk itself) we call a
move_diskfunction to move the messages between the different queues.Order of moving messages:
qout <-- qdisk <-- qoverflow.
In this
move_diskfunction there is a lack of error handling when reading from the disk which results in a crash whenlog_msg_get_sizeis called with passing a NULL pointer to it.Note that reliable disk-buffer is not affected.
Question:
_move_disk()is a void function.