Skip to content

Commit

Permalink
auditbeat btmp offset check
Browse files Browse the repository at this point in the history
Add check that saved offset is not larger than the current file size
to prevent seeking past the end of file
  • Loading branch information
leehinman committed Mar 11, 2021
1 parent d0ce4d5 commit 0a21f8e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- system/socket: Having some CPUs unavailable to Auditbeat could cause startup errors or event loss. {pull}22827[22827]
- Note incompatibility of system/socket on ARM. {pull}23381[23381]
- system/login: Fixed offset reset on inode reuse. {pull}24414[24414]
- system/login: Add additional offset check for utmp files. {pull}24515[24515]

*Filebeat*

Expand Down
6 changes: 3 additions & 3 deletions x-pack/auditbeat/module/system/login/utmp.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@ func (r *UtmpFileReader) readNewInFile(loginRecordC chan<- LoginRecord, errorC c

size := utmpFile.Size
oldSize := savedUtmpFile.Size
if size < oldSize {
if size < oldSize || utmpFile.Offset > size {
// UTMP files are append-only and so this is weird. It might be a sign of
// a highly unlikely inode reuse - or of something more nefarious.
// Setting isKnownFile to false so we read the whole file from the beginning.
isKnownFile = false

r.log.Warnf("Unexpectedly, the file %v is smaller than before (new: %v, old: %v) - reading whole file.",
utmpFile.Path, size, oldSize)
r.log.Warnf("saved size or offset illogical (new=%+v, saved=%+v) - reading whole file.",
utmpFile, savedUtmpFile)
}

if !isKnownFile && size == 0 {
Expand Down

0 comments on commit 0a21f8e

Please sign in to comment.