From 2d35915b13ae0147ca4133c93cdbee280ef9dff6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 11 May 2018 14:20:05 +0200 Subject: sys/linux: add missing consts for video4linux.txt For now other arches are regenerated on upstream tree. It does not contain a bunch of consts, so we define them to 1 for now. arm64 consts are left intact. video4linux.txt is added to "android" files in syz-extract, so that future make extract runs don't overwrite arm64 consts. Also fix VIDIOC_G_FBUF argument direction, currently tests crash with: panic: call ioctl$VIDIOC_G_FBUF: pointer arg 'buffer' has output direction [recovered] panic: call ioctl$VIDIOC_G_FBUF: pointer arg 'buffer' has output direction --- sys/syz-extract/extract.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sys/syz-extract/extract.go') diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go index e2203fbc5..0e41b7d01 100644 --- a/sys/syz-extract/extract.go +++ b/sys/syz-extract/extract.go @@ -228,6 +228,11 @@ func archFileList(os, arch string, files []string) (string, []string, []string, } androidFiles := map[string]bool{ "tlk_device.txt": true, + // video4linux consts are generated on upstream tree, + // except for arm64 (which is generated on unknown tree). + // We add video4linux.txt here so that arm64 consts are not + // overwritten during make extract. + "video4linux.txt": true, } for _, f := range matches { f = filepath.Base(f) -- cgit mrf-deployment