kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Prevent freeing a possible invalid pointer from journald

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-02-21 11:07:57 -08:00
parent 1ad165dba1
commit 81630df854
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/logger/journald/read.go
View file

@ -237,7 +237,10 @@ drain:
// free(NULL) is safe // free(NULL) is safe
C.free(unsafe.Pointer(oldCursor)) C.free(unsafe.Pointer(oldCursor))
C.sd_journal_get_cursor(j, &cursor) if C.sd_journal_get_cursor(j, &cursor) != 0 {
// ensure that we won't be freeing an address that's invalid
cursor = nil
}
return cursor return cursor
} }
@ -272,7 +275,6 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, config logger.Re
s.readers.mu.Lock() s.readers.mu.Lock()
delete(s.readers.readers, logWatcher) delete(s.readers.readers, logWatcher)
s.readers.mu.Unlock() s.readers.mu.Unlock()
C.sd_journal_close(j)
close(logWatcher.Msg) close(logWatcher.Msg)
}() }()
@ -307,9 +309,9 @@ func (s *journald) readLogs(logWatcher *logger.LogWatcher, config logger.ReadCon
following := false following := false
defer func(pfollowing *bool) { defer func(pfollowing *bool) {
if !*pfollowing { if !*pfollowing {
C.sd_journal_close(j)
close(logWatcher.Msg) close(logWatcher.Msg)
} }
C.sd_journal_close(j)
}(&following) }(&following)
// Remove limits on the size of data items that we'll retrieve. // Remove limits on the size of data items that we'll retrieve.
rc = C.sd_journal_set_data_threshold(j, C.size_t(0)) rc = C.sd_journal_set_data_threshold(j, C.size_t(0))