reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2025-02-19 11:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gometalinter: clean up vetshadow

Browse Source 
This just cleans up existing warnings.
vetshadow is not enabled yet because it crashes.

Update #538
This commit is contained in:
Dmitry Vyukov 2018-07-31 20:38:33 +02:00
parent ba6c552acd
commit 8ef497b652
9 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gometalinter.json
View File

@ -38,6 +38,7 @@
"(sys/(akaros|freebsd|fuchsia|linux|netbsd|test|windows)/init.*|sys/targets/common.go).* don't use ALL_CAPS in Go names",
"exported .* should have comment",
"comment on .* should be of the form",
"declaration of \"err\" shadows",
"(pkg/csource/generated.go|pkg/report/linux.go|pkg/build/linux_generated.go).* line is [0-9]+ characters"
]
}

12
dashboard/app/jobs.go
View File

@ -54,7 +54,7 @@ func handleTestRequest(c context.Context, bugID, user, extID, link, patch, repo,
if err := datastore.Get(c, bugKey, bug); err != nil {
return err
}
bugReporting := bugReportingByName(bug, bugReporting.Name)
bugReporting = bugReportingByName(bug, bugReporting.Name)
bugCC := strings.Split(bugReporting.CC, "|")
merged := email.MergeEmailLists(bugCC, jobCC)
bugReporting.CC = strings.Join(merged, "|")
@ -150,12 +150,12 @@ func addTestJob(c context.Context, bug *Bug, bugKey *datastore.Key, bugReporting
if len(jobs) != 0 {
// The job is already present, update link.
deletePatch = true
job, jobKey := jobs[0], keys[0]
if job.Link != "" || link == "" {
existingJob, jobKey := jobs[0], keys[0]
if existingJob.Link != "" || link == "" {
return nil
}
job.Link = link
if _, err := datastore.Put(c, jobKey, job); err != nil {
existingJob.Link = link
if _, err := datastore.Put(c, jobKey, existingJob); err != nil {
return fmt.Errorf("failed to put job: %v", err)
}
return nil
@ -218,7 +218,7 @@ retry:
stale := false
tx := func(c context.Context) error {
stale = false
job := new(Job)
job = new(Job)
if err := datastore.Get(c, jobKey, job); err != nil {
return fmt.Errorf("job %v: failed to get in tx: %v", jobID, err)
}

4
pkg/ast/parser.go
View File

@ -262,11 +262,11 @@ func (p *parser) parseTypeDef() *TypeDef {
}
p.consume(tokRBrack)
if p.tok == tokLBrace || p.tok == tokLBrack {
name := &Ident{
emptyName := &Ident{
Pos: pos0,
Name: "",
}
str = p.parseStruct(name)
str = p.parseStruct(emptyName)
} else {
typ = p.parseType()
}

2
pkg/compiler/consts.go
View File

@ -293,7 +293,7 @@ func DeserializeConsts(data []byte, file string, eh ast.ErrorHandler) map[string
ok = false
continue
}
if _, ok := consts[name]; ok {
if _, dup := consts[name]; dup {
eh(pos, fmt.Sprintf("duplicate const %q", name))
ok = false
continue

5
pkg/email/parser.go
View File

@ -247,11 +247,12 @@ func extractArgsLine(body []byte) string {
return strings.TrimSpace(string(body[pos : pos+lineEnd]))
}
func parseBody(r io.Reader, headers mail.Header) (body []byte, attachments [][]byte, err error) {
func parseBody(r io.Reader, headers mail.Header) ([]byte, [][]byte, error) {
// git-send-email sends emails without Content-Type, let's assume it's text.
mediaType := "text/plain"
var params map[string]string
if contentType := headers.Get("Content-Type"); contentType != "" {
var err error
mediaType, params, err = mime.ParseMediaType(headers.Get("Content-Type"))
if err != nil {
return nil, nil, fmt.Errorf("failed to parse email header 'Content-Type': %v", err)
@ -281,6 +282,8 @@ func parseBody(r io.Reader, headers mail.Header) (body []byte, attachments [][]b
if !strings.HasPrefix(mediaType, "multipart/") {
return nil, nil, nil
}
var body []byte
var attachments [][]byte
mr := multipart.NewReader(r, params["boundary"])
for {
p, err := mr.NextPart()

18
pkg/ifuzz/ifuzz.go
View File

@ -158,23 +158,23 @@ func Mutate(cfg *Config, r *rand.Rand, text []byte) []byte {
switch x := r.Intn(100); {
case x < 5 && len(text1) != 0:
// delete byte
i := r.Intn(len(text1))
copy(text1[i:], text1[i+1:])
pos := r.Intn(len(text1))
copy(text1[pos:], text1[pos+1:])
text1 = text1[:len(text1)-1]
case x < 40 && len(text1) != 0:
// replace a byte
i := r.Intn(len(text1))
text1[i] = byte(r.Intn(256))
pos := r.Intn(len(text1))
text1[pos] = byte(r.Intn(256))
case x < 70 && len(text1) != 0:
// flip a bit
i := r.Intn(len(text1))
text1[i] ^= 1 << byte(r.Intn(8))
pos := r.Intn(len(text1))
text1[pos] ^= 1 << byte(r.Intn(8))
default:
// insert a byte
i := r.Intn(len(text1) + 1)
pos := r.Intn(len(text1) + 1)
text1 = append(text1, 0)
copy(text1[i+1:], text1[i:])
text1[i] = byte(r.Intn(256))
copy(text1[pos+1:], text1[pos:])
text1[pos] = byte(r.Intn(256))
}
}
insns[i] = text1

94
pkg/repro/repro.go
View File

@ -433,22 +433,24 @@ func (ctx *context) simplifyProg(res *Result) (*Result, error) {
for _, simplify := range progSimplifies {
opts := res.Opts
if simplify(&opts) {
crashed, err := ctx.testProg(res.Prog, res.Duration, opts)
if err != nil {
return nil, err
}
if crashed {
res.Opts = opts
// Simplification successful, try extracting C repro.
res, err := ctx.extractC(res)
if err != nil {
return nil, err
}
if res.CRepro {
return res, nil
}
}
if !simplify(&opts) {
continue
}
crashed, err := ctx.testProg(res.Prog, res.Duration, opts)
if err != nil {
return nil, err
}
if !crashed {
continue
}
res.Opts = opts
// Simplification successful, try extracting C repro.
res, err = ctx.extractC(res)
if err != nil {
return nil, err
}
if res.CRepro {
return res, nil
}
}
@ -614,30 +616,6 @@ func (ctx *context) bisectProgs(progs []*prog.LogEntry, pred func([]*prog.LogEnt
[]*prog.LogEntry, error) {
ctx.reproLog(3, "bisect: bisecting %d programs", len(progs))
compose := func(guilty1, guilty2 [][]*prog.LogEntry, chunk []*prog.LogEntry) []*prog.LogEntry {
progs := []*prog.LogEntry{}
for _, c := range guilty1 {
progs = append(progs, c...)
}
progs = append(progs, chunk...)
for _, c := range guilty2 {
progs = append(progs, c...)
}
return progs
}
logGuilty := func(guilty [][]*prog.LogEntry) string {
log := "["
for i, chunk := range guilty {
log += fmt.Sprintf("<%d>", len(chunk))
if i != len(guilty)-1 {
log += ", "
}
}
log += "]"
return log
}
ctx.reproLog(3, "bisect: executing all %d programs", len(progs))
crashed, err := pred(progs)
if err != nil {
@ -650,7 +628,7 @@ func (ctx *context) bisectProgs(progs []*prog.LogEntry, pred func([]*prog.LogEnt
guilty := [][]*prog.LogEntry{progs}
again:
ctx.reproLog(3, "bisect: guilty chunks: %v", logGuilty(guilty))
ctx.reproLog(3, "bisect: guilty chunks: %v", chunksToStr(guilty))
for i, chunk := range guilty {
if len(chunk) == 1 {
continue
@ -658,14 +636,16 @@ again:
guilty1 := guilty[:i]
guilty2 := guilty[i+1:]
ctx.reproLog(3, "bisect: guilty chunks split: %v, <%v>, %v", logGuilty(guilty1), len(chunk), logGuilty(guilty2))
ctx.reproLog(3, "bisect: guilty chunks split: %v, <%v>, %v",
chunksToStr(guilty1), len(chunk), chunksToStr(guilty2))
chunk1 := chunk[0 : len(chunk)/2]
chunk2 := chunk[len(chunk)/2:]
ctx.reproLog(3, "bisect: chunk split: <%v> => <%v>, <%v>", len(chunk), len(chunk1), len(chunk2))
ctx.reproLog(3, "bisect: chunk split: <%v> => <%v>, <%v>",
len(chunk), len(chunk1), len(chunk2))
ctx.reproLog(3, "bisect: triggering crash without chunk #1")
progs := compose(guilty1, guilty2, chunk2)
progs = flatenChunks(guilty1, guilty2, chunk2)
crashed, err := pred(progs)
if err != nil {
return nil, err
@ -681,7 +661,7 @@ again:
}
ctx.reproLog(3, "bisect: triggering crash without chunk #2")
progs = compose(guilty1, guilty2, chunk1)
progs = flatenChunks(guilty1, guilty2, chunk1)
crashed, err = pred(progs)
if err != nil {
return nil, err
@ -719,6 +699,30 @@ again:
return progs, nil
}
func flatenChunks(guilty1, guilty2 [][]*prog.LogEntry, chunk []*prog.LogEntry) []*prog.LogEntry {
var progs []*prog.LogEntry
for _, c := range guilty1 {
progs = append(progs, c...)
}
progs = append(progs, chunk...)
for _, c := range guilty2 {
progs = append(progs, c...)
}
return progs
}
func chunksToStr(chunks [][]*prog.LogEntry) string {
log := "["
for i, chunk := range chunks {
log += fmt.Sprintf("<%d>", len(chunk))
if i != len(chunks)-1 {
log += ", "
}
}
log += "]"
return log
}
func reverseEntries(entries []*prog.LogEntry) []*prog.LogEntry {
last := len(entries) - 1
for i := 0; i < len(entries)/2; i++ {

22
sys/syz-extract/extract.go
View File

@ -48,13 +48,13 @@ type File struct {
done chan bool
}
type OS interface {
type Extractor interface {
prepare(sourcedir string, build bool, arches []string) error
prepareArch(arch *Arch) error
processFile(arch *Arch, info *compiler.ConstInfo) (map[string]uint64, map[string]bool, error)
}
var oses = map[string]OS{
var extractors = map[string]Extractor{
"akaros": new(akaros),
"linux": new(linux),
"freebsd": new(freebsd),
@ -79,11 +79,11 @@ func main() {
failf("%v", err)
}
OS := oses[osStr]
if OS == nil {
extractor := extractors[osStr]
if extractor == nil {
failf("unknown os: %v", osStr)
}
if err := OS.prepare(*flagSourceDir, *flagBuild, archArray); err != nil {
if err := extractor.prepare(*flagSourceDir, *flagBuild, archArray); err != nil {
failf("%v", err)
}
@ -132,7 +132,7 @@ func main() {
for job := range jobC {
switch j := job.(type) {
case *Arch:
infos, err := processArch(OS, j)
infos, err := processArch(extractor, j)
j.err = err
close(j.done)
if j.err == nil {
@ -142,7 +142,7 @@ func main() {
}
}
case *File:
j.consts, j.undeclared, j.err = processFile(OS, j.arch, j)
j.consts, j.undeclared, j.err = processFile(extractor, j.arch, j)
close(j.done)
}
}
@ -244,7 +244,7 @@ func archFileList(os, arch string, files []string) (string, []string, []string,
return os, arches, files, nil
}
func processArch(OS OS, arch *Arch) (map[string]*compiler.ConstInfo, error) {
func processArch(extractor Extractor, arch *Arch) (map[string]*compiler.ConstInfo, error) {
errBuf := new(bytes.Buffer)
eh := func(pos ast.Pos, msg string) {
fmt.Fprintf(errBuf, "%v: %v\n", pos, msg)
@ -257,13 +257,13 @@ func processArch(OS OS, arch *Arch) (map[string]*compiler.ConstInfo, error) {
if infos == nil {
return nil, fmt.Errorf("%v", errBuf.String())
}
if err := OS.prepareArch(arch); err != nil {
if err := extractor.prepareArch(arch); err != nil {
return nil, err
}
return infos, nil
}
func processFile(OS OS, arch *Arch, file *File) (map[string]uint64, map[string]bool, error) {
func processFile(extractor Extractor, arch *Arch, file *File) (map[string]uint64, map[string]bool, error) {
inname := filepath.Join("sys", arch.target.OS, file.name)
outname := strings.TrimSuffix(inname, ".txt") + "_" + arch.target.Arch + ".const"
if file.info == nil {
@ -273,7 +273,7 @@ func processFile(OS OS, arch *Arch, file *File) (map[string]uint64, map[string]b
os.Remove(outname)
return nil, nil, nil
}
consts, undeclared, err := OS.processFile(arch, file.info)
consts, undeclared, err := extractor.processFile(arch, file.info)
if err != nil {
return nil, nil, err
}

2
syz-ci/syzupdater.go
View File

@ -232,7 +232,7 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error {
}
for target := range upd.targets {
parts := strings.Split(target, "/")
cmd := osutil.Command("make", "target")
cmd = osutil.Command("make", "target")
cmd.Dir = upd.syzkallerDir
cmd.Env = append([]string{}, os.Environ()...)
cmd.Env = append(cmd.Env,