aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/cover/html.go
diff options
context:
space:
mode:
authorJoey Jiao <quic_jiangenj@quicinc.com>2024-05-14 10:51:19 +0800
committerDmitry Vyukov <dvyukov@google.com>2024-05-27 09:44:25 +0000
commitb75d07e8995d9d6682851c553b23b4d3e9734436 (patch)
tree09e80808b88d2f6f576becef41a887eb242f3ce3 /pkg/cover/html.go
parent339d8cf83c825a88ff6d1c6b5a73e20fffd33010 (diff)
all: adapt all cover and sig to 64bit
Taken some arm64 devices for example: kaslr_offset is diff at bits 12-40, and kernel modules are loaded at 2GB space, so we have `ffffffd342e10000 T _stext` where uppper 32bit is ffffffd3. However, if we check modules range, the 1st module is loaded at 0xffffffd2eeb2a000, while the last module is loaded at 0xffffffd2f42c4000. We can see the upper 32bits are diff for core kernel and modules. If we use current 32bits for covered PC, we will get wrong module address recovered. So we need to move to 64bit cover and signal: - change cover/sig to 64bit to fit for syz-executor change - remove kernel upper base logic as kernel upper base is not a constant when kaslr enabled for core kernel and modules. - remove unused pcBase
Diffstat (limited to 'pkg/cover/html.go')
-rw-r--r--pkg/cover/html.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/cover/html.go b/pkg/cover/html.go
index 5a78b75f8..935a19efc 100644
--- a/pkg/cover/html.go
+++ b/pkg/cover/html.go
@@ -25,7 +25,7 @@ import (
type CoverHandlerParams struct {
Progs []Prog
- CoverFilter map[uint32]uint32
+ CoverFilter map[uint64]uint32
Debug bool
Force bool
}
@@ -297,7 +297,7 @@ func (rg *ReportGenerator) DoFilterPCs(w io.Writer, params CoverHandlerParams) e
continue
}
uniquePCs[pc] = true
- if params.CoverFilter[uint32(pc)] != 0 {
+ if params.CoverFilter[pc] != 0 {
pcs = append(pcs, pc)
}
}
@@ -620,12 +620,12 @@ func (rg *ReportGenerator) DoCSV(w io.Writer, params CoverHandlerParams) error {
return writer.WriteAll(data)
}
-func fixUpPCs(target string, progs []Prog, coverFilter map[uint32]uint32) []Prog {
+func fixUpPCs(target string, progs []Prog, coverFilter map[uint64]uint32) []Prog {
if coverFilter != nil {
for i, prog := range progs {
var nPCs []uint64
for _, pc := range prog.PCs {
- if coverFilter[uint32(pc)] != 0 {
+ if coverFilter[pc] != 0 {
nPCs = append(nPCs, pc)
}
}