diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-06-11 22:10:07 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-06-11 23:19:34 +0200 |
| commit | 588020678f34b89925fcfbcaf8f635c5850e8e7a (patch) | |
| tree | 0d0467180954d05e261681124088a1025f90cc58 /pkg | |
| parent | 829fd56fbf6fc9243f8ac969c7c58172e5adcb45 (diff) | |
all: use more respective language
Some terms are normalised on the technical level
but may be oppressive on a societal level.
Replace them with more technically neutral terms.
See the following doc for a longer version:
https://tools.ietf.org/id/draft-knodel-terminology-00.html
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/csource/generated.go | 4 | ||||
| -rw-r--r-- | pkg/email/patch_test.go | 2 | ||||
| -rw-r--r-- | pkg/report/linux.go | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index eaa2b714f..0d4219de6 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -8332,13 +8332,13 @@ static void setup_kcsan() } #if SYZ_EXECUTOR -static void setup_kcsan_filterlist(char** frames, int nframes, bool blacklist) +static void setup_kcsan_filterlist(char** frames, int nframes, bool ignore) { int fd = open(KCSAN_DEBUGFS_FILE, O_WRONLY); if (fd == -1) fail("failed to open(\"%s\")", KCSAN_DEBUGFS_FILE); - const char* const filtertype = blacklist ? "blacklist" : "whitelist"; + const char* const filtertype = ignore ? "blacklist" : "whitelist"; printf("adding functions to KCSAN %s: ", filtertype); dprintf(fd, "%s\n", filtertype); for (int i = 0; i < nframes; ++i) { diff --git a/pkg/email/patch_test.go b/pkg/email/patch_test.go index e34e60b64..0919db9ca 100644 --- a/pkg/email/patch_test.go +++ b/pkg/email/patch_test.go @@ -404,7 +404,6 @@ Index: usb-devel/drivers/usb/core/hub.c +++ usb-devel/drivers/usb/core/hub.c @@ -36,6 +36,10 @@ #include "hub.h" - #include "otg_whitelist.h" +#undef dev_dbg +#define dev_dbg dev_info @@ -452,7 +451,6 @@ Index: usb-devel/drivers/usb/core/hub.c +++ usb-devel/drivers/usb/core/hub.c @@ -36,6 +36,10 @@ #include "hub.h" - #include "otg_whitelist.h" +#undef dev_dbg +#define dev_dbg dev_info diff --git a/pkg/report/linux.go b/pkg/report/linux.go index 09b71a60f..aae212062 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -26,7 +26,7 @@ type linux struct { taskContext *regexp.Regexp cpuContext *regexp.Regexp questionableFrame *regexp.Regexp - guiltyFileBlacklist []*regexp.Regexp + guiltyFileIgnores []*regexp.Regexp reportStartIgnores []*regexp.Regexp infoMessagesWithStack [][]byte eoi []byte @@ -54,7 +54,7 @@ func ctorLinux(cfg *config) (Reporter, []string, error) { ctx.cpuContext = regexp.MustCompile(`\[ *C[0-9]+\]`) ctx.questionableFrame = regexp.MustCompile(`(\[\<[0-9a-f]+\>\])? \? `) ctx.eoi = []byte("<EOI>") - ctx.guiltyFileBlacklist = []*regexp.Regexp{ + ctx.guiltyFileIgnores = []*regexp.Regexp{ regexp.MustCompile(`.*\.h`), regexp.MustCompile(`^lib/.*`), regexp.MustCompile(`^virt/lib/.*`), @@ -423,7 +423,7 @@ func (ctx *linux) extractGuiltyFile(rep *Report) string { if strings.HasPrefix(rep.Title, "INFO: rcu detected stall") { // Special case for rcu stalls. // There are too many frames that we want to skip before actual guilty frames, - // we would need to blacklist too many files and that would be fragile. + // we would need to ignore too many files and that would be fragile. // So instead we try to extract guilty file starting from the known // interrupt entry point first. if pos := bytes.Index(report, []byte(" apic_timer_interrupt+0x")); pos != -1 { @@ -439,7 +439,7 @@ func (ctx *linux) extractGuiltyFileImpl(report []byte) string { files := ctx.extractFiles(report) nextFile: for _, file := range files { - for _, re := range ctx.guiltyFileBlacklist { + for _, re := range ctx.guiltyFileIgnores { if re.MatchString(file) { continue nextFile } |