From 7b8cf96b4a6f4fd777e261a206276e9c7e30f14c Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Thu, 14 Nov 2019 15:37:34 +0000 Subject: [PATCH] Kpti settings was not affected for regular runs --- CHANGELOG.md | 6 ++++++ main.go | 4 ++++ pew.go | 1 + 3 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b3b483..7c31f88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Fixed + +- Kpti settings was not affected for regular runs. + ## [1.1.2] 2019-09-05 ### Added diff --git a/main.go b/main.go index 5a1e664..e3a889c 100644 --- a/main.go +++ b/main.go @@ -264,6 +264,10 @@ func main() { log.Fatalln("Only one of disable/enable can be used at once") } + if *yekpti && *nokpti { + log.Fatalln("Only one of disable/enable can be used at once") + } + kcfg, err := config.ReadKernelConfig(*kcfgPath) if err != nil { log.Println(err) diff --git a/pew.go b/pew.go index 1f18a63..0012073 100644 --- a/pew.go +++ b/pew.go @@ -328,6 +328,7 @@ func whatever(swg *sizedwaitgroup.SizedWaitGroup, ka config.Artifact, q.SetKASLR(!ka.Mitigations.DisableKaslr) q.SetSMEP(!ka.Mitigations.DisableSmep) q.SetSMAP(!ka.Mitigations.DisableSmap) + q.SetKPTI(!ka.Mitigations.DisableKpti) err = q.Start() if err != nil {