aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gometalinter.json1
-rw-r--r--dashboard/app/app_test.go10
-rw-r--r--pkg/config/config_test.go4
-rw-r--r--pkg/csource/options_test.go10
-rw-r--r--pkg/gce/gce.go2
-rw-r--r--pkg/ifuzz/pseudo.go6
-rw-r--r--pkg/report/akaros.go4
-rw-r--r--pkg/report/freebsd.go4
-rw-r--r--pkg/report/gvisor.go18
-rw-r--r--pkg/report/linux.go28
-rw-r--r--pkg/report/linux_test.go6
-rw-r--r--pkg/serializer/serializer_test.go2
-rw-r--r--pkg/symbolizer/symbolizer_test.go10
-rw-r--r--pkg/vcs/git_test.go2
-rw-r--r--prog/alloc_test.go4
-rw-r--r--sys/linux/init_alg.go10
-rw-r--r--sys/targets/targets.go14
-rw-r--r--tools/syz-benchcmp/benchcmp.go8
18 files changed, 72 insertions, 71 deletions
diff --git a/.gometalinter.json b/.gometalinter.json
index ab4eb7fc5..470b19be6 100644
--- a/.gometalinter.json
+++ b/.gometalinter.json
@@ -19,6 +19,7 @@
"sys/test/gen"
],
"enable": [
+ "gofmt",
"golint",
"structcheck",
"megacheck",
diff --git a/dashboard/app/app_test.go b/dashboard/app/app_test.go
index abd9f6d6d..f782c5e70 100644
--- a/dashboard/app/app_test.go
+++ b/dashboard/app/app_test.go
@@ -30,7 +30,7 @@ var testConfig = &GlobalConfig{
"\"Bar\" <BlackListed@Domain.com>",
},
Namespaces: map[string]*Config{
- "test1": &Config{
+ "test1": {
AccessLevel: AccessAdmin,
Key: "test1keytest1keytest1key",
Clients: map[string]string{
@@ -60,7 +60,7 @@ var testConfig = &GlobalConfig{
},
},
},
- "test2": &Config{
+ "test2": {
AccessLevel: AccessAdmin,
Key: "test2keytest2keytest2key",
Clients: map[string]string{
@@ -93,7 +93,7 @@ var testConfig = &GlobalConfig{
},
},
// Namespaces for access level testing.
- "access-admin": &Config{
+ "access-admin": {
AccessLevel: AccessAdmin,
Key: "adminkeyadminkeyadminkey",
Clients: map[string]string{
@@ -110,7 +110,7 @@ var testConfig = &GlobalConfig{
},
},
},
- "access-user": &Config{
+ "access-user": {
AccessLevel: AccessUser,
Key: "userkeyuserkeyuserkey",
Clients: map[string]string{
@@ -128,7 +128,7 @@ var testConfig = &GlobalConfig{
},
},
},
- "access-public": &Config{
+ "access-public": {
AccessLevel: AccessPublic,
Key: "publickeypublickeypublickey",
Clients: map[string]string{
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 6d3ce034e..c8cd3e6ed 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -116,11 +116,11 @@ func TestLoad(t *testing.T) {
Config{
Foo: 1,
Arr: []Nested{
- Nested{
+ {
Aaa: 12,
Bbb: "bbb",
},
- Nested{
+ {
Aaa: 13,
Bbb: "ccc",
},
diff --git a/pkg/csource/options_test.go b/pkg/csource/options_test.go
index ad86f8786..61ebe5827 100644
--- a/pkg/csource/options_test.go
+++ b/pkg/csource/options_test.go
@@ -30,7 +30,7 @@ func TestParseOptionsCanned(t *testing.T) {
`{"threaded":true,"collide":true,"repeat":true,"procs":10,"sandbox":"namespace",
"fault":true,"fault_call":1,"fault_nth":2,"tun":true,"tmpdir":true,"cgroups":true,
"netdev":true,"resetnet":true,
- "segv":true,"waitrepeat":true,"debug":true,"repro":true}`: Options{
+ "segv":true,"waitrepeat":true,"debug":true,"repro":true}`: {
Threaded: true,
Collide: true,
Repeat: true,
@@ -47,7 +47,7 @@ func TestParseOptionsCanned(t *testing.T) {
HandleSegv: true,
Repro: true,
},
- "{Threaded:true Collide:true Repeat:true Procs:1 Sandbox:none Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": Options{
+ "{Threaded:true Collide:true Repeat:true Procs:1 Sandbox:none Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": {
Threaded: true,
Collide: true,
Repeat: true,
@@ -62,7 +62,7 @@ func TestParseOptionsCanned(t *testing.T) {
HandleSegv: true,
Repro: false,
},
- "{Threaded:true Collide:true Repeat:true Procs:1 Sandbox: Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": Options{
+ "{Threaded:true Collide:true Repeat:true Procs:1 Sandbox: Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": {
Threaded: true,
Collide: true,
Repeat: true,
@@ -77,7 +77,7 @@ func TestParseOptionsCanned(t *testing.T) {
HandleSegv: true,
Repro: false,
},
- "{Threaded:false Collide:true Repeat:true Procs:1 Sandbox:namespace Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true EnableCgroups:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": Options{
+ "{Threaded:false Collide:true Repeat:true Procs:1 Sandbox:namespace Fault:false FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true EnableCgroups:true HandleSegv:true WaitRepeat:true Debug:false Repro:false}": {
Threaded: false,
Collide: true,
Repeat: true,
@@ -122,7 +122,7 @@ func allOptionsSingle(OS string) []Options {
}
func allOptionsPermutations(OS string) []Options {
- opts := []Options{Options{}}
+ opts := []Options{{}}
fields := reflect.TypeOf(Options{}).NumField()
for i := 0; i < fields; i++ {
var newOpts []Options
diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go
index bb6d89838..2e0b397ad 100644
--- a/pkg/gce/gce.go
+++ b/pkg/gce/gce.go
@@ -125,7 +125,7 @@ func (ctx *Context) CreateInstance(name, machineType, image, sshkey string) (str
},
},
NetworkInterfaces: []*compute.NetworkInterface{
- &compute.NetworkInterface{
+ {
Network: ctx.Network,
Subnetwork: ctx.Subnetwork,
},
diff --git a/pkg/ifuzz/pseudo.go b/pkg/ifuzz/pseudo.go
index 2d55ea266..8ca8ef8d6 100644
--- a/pkg/ifuzz/pseudo.go
+++ b/pkg/ifuzz/pseudo.go
@@ -550,9 +550,9 @@ func pciAddrPort(r *rand.Rand) (addr uint32, port uint16, size int) {
var controlRegisters = []uint8{0, 3, 4, 8}
var controlRegistersBits = map[uint8][]uint8{
- 0: []uint8{0, 1, 2, 3, 4, 5, 16, 18, 29, 30, 31},
- 3: []uint8{3, 5},
- 4: []uint8{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 13, 14, 16, 17, 18, 20, 21, 22},
+ 0: {0, 1, 2, 3, 4, 5, 16, 18, 29, 30, 31},
+ 3: {3, 5},
+ 4: {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 13, 14, 16, 17, 18, 20, 21, 22},
}
const eferMSR = 0xC0000080
diff --git a/pkg/report/akaros.go b/pkg/report/akaros.go
index 24bf5eedc..cd6fb6a1c 100644
--- a/pkg/report/akaros.go
+++ b/pkg/report/akaros.go
@@ -155,7 +155,7 @@ var akarosStackParams = &stackParams{
}
var akarosOopses = []*oops{
- &oops{
+ {
[]byte("kernel panic"),
[]oopsFormat{
{
@@ -187,7 +187,7 @@ var akarosOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("kernel warning"),
[]oopsFormat{
{
diff --git a/pkg/report/freebsd.go b/pkg/report/freebsd.go
index 1b332eabf..7e84cbea1 100644
--- a/pkg/report/freebsd.go
+++ b/pkg/report/freebsd.go
@@ -80,7 +80,7 @@ func (ctx *freebsd) Symbolize(rep *Report) error {
var freebsdStackParams = &stackParams{}
var freebsdOopses = []*oops{
- &oops{
+ {
[]byte("Fatal trap"),
[]oopsFormat{
{
@@ -94,7 +94,7 @@ var freebsdOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("panic:"),
[]oopsFormat{
{
diff --git a/pkg/report/gvisor.go b/pkg/report/gvisor.go
index 5f4e854c6..5f6a273cf 100644
--- a/pkg/report/gvisor.go
+++ b/pkg/report/gvisor.go
@@ -110,7 +110,7 @@ var gvisorTitleReplacement = []replacement{
}
var gvisorOopses = []*oops{
- &oops{
+ {
[]byte("panic:"),
[]oopsFormat{
{
@@ -121,7 +121,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("Panic:"),
[]oopsFormat{
{
@@ -132,7 +132,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("fatal error:"),
[]oopsFormat{
{
@@ -143,7 +143,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("runtime error:"),
[]oopsFormat{
{
@@ -154,7 +154,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("SIGSEGV:"),
[]oopsFormat{
{
@@ -165,7 +165,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("SIGBUS:"),
[]oopsFormat{
{
@@ -176,7 +176,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("FATAL ERROR:"),
[]oopsFormat{
{
@@ -187,7 +187,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("WARNING: DATA RACE"),
[]oopsFormat{
{
@@ -199,7 +199,7 @@ var gvisorOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("Invalid request partialResult"),
[]oopsFormat{
{
diff --git a/pkg/report/linux.go b/pkg/report/linux.go
index 7e85102d2..395ff6d83 100644
--- a/pkg/report/linux.go
+++ b/pkg/report/linux.go
@@ -591,7 +591,7 @@ func warningStackFmt(skip ...string) *stackFmt {
}
var linuxOopses = []*oops{
- &oops{
+ {
[]byte("BUG:"),
[]oopsFormat{
{
@@ -785,7 +785,7 @@ var linuxOopses = []*oops{
compile("BUG: no syscalls can create resource"),
},
},
- &oops{
+ {
[]byte("WARNING:"),
[]oopsFormat{
{
@@ -909,7 +909,7 @@ var linuxOopses = []*oops{
compile("WARNING: /etc/ssh/moduli does not exist, using fixed modulus"), // printed by sshd
},
},
- &oops{
+ {
[]byte("INFO:"),
[]oopsFormat{
{
@@ -1012,7 +1012,7 @@ var linuxOopses = []*oops{
compile("INFO: no syscalls can create resource"), // pkg/host output in debug mode
},
},
- &oops{
+ {
[]byte("Unable to handle kernel paging request"),
[]oopsFormat{
{
@@ -1023,7 +1023,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("general protection fault:"),
[]oopsFormat{
{
@@ -1040,7 +1040,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("Kernel panic"),
[]oopsFormat{
{
@@ -1078,7 +1078,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("kernel BUG"),
[]oopsFormat{
{
@@ -1104,7 +1104,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("Kernel BUG"),
[]oopsFormat{
{
@@ -1114,7 +1114,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("BUG kmalloc-"),
[]oopsFormat{
{
@@ -1124,7 +1124,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("divide error:"),
[]oopsFormat{
{
@@ -1135,7 +1135,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("invalid opcode:"),
[]oopsFormat{
{
@@ -1146,7 +1146,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("UBSAN:"),
[]oopsFormat{
{
@@ -1156,7 +1156,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("Booting the kernel."),
[]oopsFormat{
{
@@ -1167,7 +1167,7 @@ var linuxOopses = []*oops{
},
[]*regexp.Regexp{},
},
- &oops{
+ {
[]byte("unregister_netdevice: waiting for"),
[]oopsFormat{
{
diff --git a/pkg/report/linux_test.go b/pkg/report/linux_test.go
index 338ab27a0..162f6638e 100644
--- a/pkg/report/linux_test.go
+++ b/pkg/report/linux_test.go
@@ -136,13 +136,13 @@ func TestLinuxSymbolizeLine(t *testing.T) {
},
}
symbols := map[string][]symbolizer.Symbol{
- "foo": []symbolizer.Symbol{
+ "foo": {
{Addr: 0x1000000, Size: 0x190},
},
- "do_ipv6_setsockopt.isra.7.part.3": []symbolizer.Symbol{
+ "do_ipv6_setsockopt.isra.7.part.3": {
{Addr: 0x2000000, Size: 0x2830},
},
- "baz": []symbolizer.Symbol{
+ "baz": {
{Addr: 0x3000000, Size: 0x100},
{Addr: 0x4000000, Size: 0x200},
{Addr: 0x5000000, Size: 0x300},
diff --git a/pkg/serializer/serializer_test.go b/pkg/serializer/serializer_test.go
index 7757b345a..06dbaf304 100644
--- a/pkg/serializer/serializer_test.go
+++ b/pkg/serializer/serializer_test.go
@@ -12,7 +12,7 @@ func TestSerializer(t *testing.T) {
x := &X{
Y: Y{1},
P: &Y{2},
- A: []Y{Y{3}, Y{4}},
+ A: []Y{{3}, {4}},
F: true,
S: "a\x09b",
T: T1,
diff --git a/pkg/symbolizer/symbolizer_test.go b/pkg/symbolizer/symbolizer_test.go
index 30a8413f2..0bddb2f71 100644
--- a/pkg/symbolizer/symbolizer_test.go
+++ b/pkg/symbolizer/symbolizer_test.go
@@ -24,7 +24,7 @@ func TestParse(t *testing.T) {
"__asan_report_load2_noabort\n" +
"mm/kasan/report.c:320\n",
[]Frame{
- Frame{
+ {
PC: 0xffffffff8180a42e,
Func: "__asan_report_load2_noabort",
File: "mm/kasan/report.c",
@@ -41,14 +41,14 @@ func TestParse(t *testing.T) {
"__asan_report_load2_noabort\n" +
"mm/kasan/report.c:320\n",
[]Frame{
- Frame{
+ {
PC: 0xffffffff8180a42d,
Func: "kasan_report",
File: "mm/kasan/report.c",
Line: 301,
Inline: true,
},
- Frame{
+ {
PC: 0xffffffff8180a42d,
Func: "__asan_report_load2_noabort",
File: "mm/kasan/report.c",
@@ -63,7 +63,7 @@ func TestParse(t *testing.T) {
"fbcon_invert_region\n" +
"drivers/video/console/fbcon.c:2750\n",
[]Frame{
- Frame{
+ {
PC: 0xffffffff82fdbe0b,
Func: "fbcon_invert_region",
File: "drivers/video/console/fbcon.c",
@@ -92,7 +92,7 @@ func TestParse(t *testing.T) {
"devpts_get_priv\n" +
"fs/devpts/inode.c:588 (discriminator 3)\n",
[]Frame{
- Frame{
+ {
PC: 0xffffffff81a2aff9,
Func: "devpts_get_priv",
File: "fs/devpts/inode.c",
diff --git a/pkg/vcs/git_test.go b/pkg/vcs/git_test.go
index 095aca29a..6fae1c475 100644
--- a/pkg/vcs/git_test.go
+++ b/pkg/vcs/git_test.go
@@ -30,7 +30,7 @@ Reported-and-tested-by: and@me.com
Reported-and-Tested-by: Name-name <name@name.com>
Tested-by: Must be correct <mustbe@correct.com>
Signed-off-by: Linux Master <linux@linux-foundation.org>
-`: &Commit{
+`: {
Hash: "2075b16e32c26e4031b9fd3cbe26c54676a8fcb5",
Title: "rbtree: include rcu.h",
Author: "foobar@foobar.de",
diff --git a/prog/alloc_test.go b/prog/alloc_test.go
index 261b18d0c..c83063747 100644
--- a/prog/alloc_test.go
+++ b/prog/alloc_test.go
@@ -15,7 +15,7 @@ func TestMemAlloc(t *testing.T) {
size int // if positive do noteAlloc, otherwise -- alloc
}
tests := [][]op{
- []op{
+ {
// Just sequential allocation.
{0, -1},
{64, -64},
@@ -23,7 +23,7 @@ func TestMemAlloc(t *testing.T) {
{256, -16},
{320, -8},
},
- []op{
+ {
// First reserve some memory and then allocate.
{0, 1},
{64, 63},
diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go
index 2e9337fe8..8de400048 100644
--- a/sys/linux/init_alg.go
+++ b/sys/linux/init_alg.go
@@ -122,7 +122,7 @@ var allTypes = []algType{
}
var allAlgs = map[int][]algDesc{
- ALG_AEAD: []algDesc{
+ ALG_AEAD: {
// templates:
{"authencesn", []int{ALG_HASH, ALG_BLKCIPHER}},
{"authenc", []int{ALG_HASH, ALG_BLKCIPHER}},
@@ -162,7 +162,7 @@ var allAlgs = map[int][]algDesc{
{"aegis256-generic", nil},
{"aegis256-aesni", nil},
},
- ALG_BLKCIPHER: []algDesc{
+ ALG_BLKCIPHER: {
// templates:
{"pcbc", []int{ALG_CIPHER}},
{"cbc", []int{ALG_CIPHER}},
@@ -289,7 +289,7 @@ var allAlgs = map[int][]algDesc{
{"ecb(des3_ede)", nil},
{"ecb-des3_ede-asm", nil},
},
- ALG_CIPHER: []algDesc{
+ ALG_CIPHER: {
{"aes", nil},
{"aes-aesni", nil},
{"seed", nil},
@@ -336,7 +336,7 @@ var allAlgs = map[int][]algDesc{
{"cipher_null-generic", nil},
{"aes-asm", nil},
},
- ALG_HASH: []algDesc{
+ ALG_HASH: {
// templates:
{"cmac", []int{ALG_CIPHER}},
{"cbcmac", []int{ALG_CIPHER}},
@@ -435,7 +435,7 @@ var allAlgs = map[int][]algDesc{
{"sha1-ssse3", nil},
{"crc32c-intel", nil},
},
- ALG_RNG: []algDesc{
+ ALG_RNG: {
{"stdrng", nil},
{"ansi_cprng", nil},
{"jitterentropy_rng", nil},
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 72afab4fa..59220625c 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -57,7 +57,7 @@ func Get(OS, arch string) *Target {
// nolint: lll
var List = map[string]map[string]*Target{
- "test": map[string]*Target{
+ "test": {
"64": {
PtrSize: 8,
PageSize: 4 << 10,
@@ -107,7 +107,7 @@ var List = map[string]map[string]*Target{
},
},
},
- "linux": map[string]*Target{
+ "linux": {
"amd64": {
PtrSize: 8,
PageSize: 4 << 10,
@@ -158,7 +158,7 @@ var List = map[string]map[string]*Target{
KernelHeaderArch: "powerpc",
},
},
- "freebsd": map[string]*Target{
+ "freebsd": {
"amd64": {
PtrSize: 8,
PageSize: 4 << 10,
@@ -166,7 +166,7 @@ var List = map[string]map[string]*Target{
CrossCFlags: []string{"-m64", "-static"},
},
},
- "netbsd": map[string]*Target{
+ "netbsd": {
"amd64": {
PtrSize: 8,
PageSize: 4 << 10,
@@ -174,7 +174,7 @@ var List = map[string]map[string]*Target{
CrossCFlags: []string{"-m64", "-static"},
},
},
- "fuchsia": map[string]*Target{
+ "fuchsia": {
"amd64": {
PtrSize: 8,
PageSize: 4 << 10,
@@ -212,14 +212,14 @@ var List = map[string]map[string]*Target{
},
},
},
- "windows": map[string]*Target{
+ "windows": {
"amd64": {
PtrSize: 8,
// TODO(dvyukov): what should we do about 4k vs 64k?
PageSize: 4 << 10,
},
},
- "akaros": map[string]*Target{
+ "akaros": {
"amd64": {
PtrSize: 8,
PageSize: 4 << 10,
diff --git a/tools/syz-benchcmp/benchcmp.go b/tools/syz-benchcmp/benchcmp.go
index b319b51d2..b34acafd7 100644
--- a/tools/syz-benchcmp/benchcmp.go
+++ b/tools/syz-benchcmp/benchcmp.go
@@ -44,10 +44,10 @@ func main() {
}
graphs := []*Graph{
- &Graph{Name: "coverage"},
- &Graph{Name: "corpus"},
- &Graph{Name: "exec total"},
- &Graph{Name: "crash types"},
+ {Name: "coverage"},
+ {Name: "corpus"},
+ {Name: "exec total"},
+ {Name: "crash types"},
}
for i, fname := range flag.Args() {
data := readFile(fname)
generated by ggit (джигит) mrf-deployment (git 2.46.0) at 2026-03-11 22:03:54 +0000