Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #6109 to 6.x: auditd: Skip trailing zeroes in kernel version #6112

Merged
merged 1 commit into from
Jan 19, 2018
Merged

Cherry-pick #6109 to 6.x: auditd: Skip trailing zeroes in kernel version #6112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions auditbeat/module/auditd/audit_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ func createAuditdData(data map[string]string) common.MapStr {

// stream type

// stream receives callbacks from the libaudit.Reassmbler for completed events
// stream receives callbacks from the libaudit.Reassembler for completed events
// or lost events that are detected by gaps in sequence numbers.
type stream struct {
done <-chan struct{}
Expand Down Expand Up @@ -561,15 +561,17 @@ func kernelVersion() (major, minor int, full string, err error) {
return 0, 0, "", err
}

data := make([]byte, len(uname.Release))
length := len(uname.Release)
data := make([]byte, length)
for i, v := range uname.Release {
if v == 0 {
length = i
break
}
data[i] = byte(v)
}

release := string(data)
release := string(data[:length])
parts := strings.SplitN(release, ".", 3)
if len(parts) < 2 {
return 0, 0, release, errors.Errorf("failed to parse uname release '%v'", release)
Expand Down