From 414912f56237e142136369e82c4937ffb27e3d4a Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 20 Oct 2020 14:57:03 +0200 Subject: dashboard/config/linux: disable legacy USB gadgets in all configs Turns out these also break boot: https://github.com/google/syzkaller/pull/1975#issuecomment-712807462 so disable them everywhere. Update #2171 --- dashboard/config/linux/bits/base.yml | 20 ++++++++++++ dashboard/config/linux/bits/usb.yml | 22 +------------- dashboard/config/linux/stable-5.4-kasan.config | 4 +-- dashboard/config/linux/upstream-kasan.config | 42 ++++++++++---------------- dashboard/config/linux/upstream-kcsan.config | 42 ++++++++++---------------- dashboard/config/linux/upstream-kmsan.config | 42 ++++++++++---------------- dashboard/config/linux/upstream-leak.config | 42 ++++++++++---------------- 7 files changed, 87 insertions(+), 127 deletions(-) diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index 212d91296..67611f55c 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -137,3 +137,23 @@ config: # Don't test/need this (may be enabled via HID_HYPERV_MOUSE in USB/HID configs). - HYPERV: n + + # These are legacy gadget drivers that we don't reach/test and some of these break boot: + # https://github.com/google/syzkaller/pull/1975#issuecomment-712807462 + - USB_G_NCM: n + - USB_G_SERIAL: n + - USB_G_PRINTER: n + - USB_G_NOKIA: n + - USB_G_ACM_MS: n + - USB_G_MULTI: n + - USB_G_HID: n + - USB_G_DBGP: n + - USB_G_WEBCAM: n + - USB_ZERO: n + - USB_AUDIO: n + - USB_ETH: n + - USB_FUNCTIONFS: n + - USB_MASS_STORAGE: n + - USB_GADGET_TARGET: n + - USB_MIDI_GADGET: n + - USB_CDC_COMPOSITE: n diff --git a/dashboard/config/linux/bits/usb.yml b/dashboard/config/linux/bits/usb.yml index eb5fb221b..a6a6bea6e 100644 --- a/dashboard/config/linux/bits/usb.yml +++ b/dashboard/config/linux/bits/usb.yml @@ -8,26 +8,6 @@ config: - USB_GADGET - USB_RAW_GADGET: [v5.5] - USB_DUMMY_HCD - - # There are legacy gadget drivers that we don't reach anyway. - - USB_G_NCM: n - - USB_G_SERIAL: n - - USB_G_PRINTER: n - - USB_G_NOKIA: n - - USB_G_ACM_MS: n - - USB_G_MULTI: n - - USB_G_HID: n - - USB_G_DBGP: n - - USB_G_WEBCAM: n - - - USB_ZERO: n - - USB_AUDIO: n - - USB_ETH: n - - USB_FUNCTIONFS: n - - USB_MASS_STORAGE: n - - USB_GADGET_TARGET: n - - USB_MIDI_GADGET: n - - USB_CDC_COMPOSITE: n - + # We don't need/test these on the USB instance. - USB_GADGETFS: n - USB_CONFIGFS: n diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config index ca38118a8..12006d58a 100644 --- a/dashboard/config/linux/stable-5.4-kasan.config +++ b/dashboard/config/linux/stable-5.4-kasan.config @@ -5798,7 +5798,7 @@ CONFIG_USB_CONFIGFS_F_TCM=y # CONFIG_USB_AUDIO is not set # CONFIG_USB_ETH is not set # CONFIG_USB_G_NCM is not set -# CONFIG_USB_GADGETFS is not set +CONFIG_USB_GADGETFS=y # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_MASS_STORAGE is not set # CONFIG_USB_GADGET_TARGET is not set @@ -5811,7 +5811,7 @@ CONFIG_USB_CONFIGFS_F_TCM=y # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_HID is not set # CONFIG_USB_G_DBGP is not set -CONFIG_USB_G_WEBCAM=y +# CONFIG_USB_G_WEBCAM is not set CONFIG_TYPEC=y CONFIG_TYPEC_TCPM=y CONFIG_TYPEC_TCPCI=y diff --git a/dashboard/config/linux/upstream-kasan.config b/dashboard/config/linux/upstream-kasan.config index d33d15827..eed3c7df3 100644 --- a/dashboard/config/linux/upstream-kasan.config +++ b/dashboard/config/linux/upstream-kasan.config @@ -6031,34 +6031,24 @@ CONFIG_USB_CONFIGFS_F_TCM=y # # USB Gadget precomposed configurations # -CONFIG_USB_ZERO=y -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_AUDIO=y -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_G_NCM is not set CONFIG_USB_GADGETFS=y -CONFIG_USB_FUNCTIONFS=y -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_USB_GADGET_TARGET=y -CONFIG_USB_G_SERIAL=y -CONFIG_USB_MIDI_GADGET=y -CONFIG_USB_G_PRINTER=y -CONFIG_USB_CDC_COMPOSITE=y -CONFIG_USB_G_NOKIA=y -CONFIG_USB_G_ACM_MS=y +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set # CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=y -CONFIG_USB_G_DBGP=y -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set CONFIG_USB_RAW_GADGET=y # end of USB Gadget precomposed configurations diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config index f0f4482cc..f39ba7bd6 100644 --- a/dashboard/config/linux/upstream-kcsan.config +++ b/dashboard/config/linux/upstream-kcsan.config @@ -5970,34 +5970,24 @@ CONFIG_USB_CONFIGFS_F_TCM=y # # USB Gadget precomposed configurations # -CONFIG_USB_ZERO=y -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_AUDIO=y -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_G_NCM is not set CONFIG_USB_GADGETFS=y -CONFIG_USB_FUNCTIONFS=y -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_USB_GADGET_TARGET=y -CONFIG_USB_G_SERIAL=y -CONFIG_USB_MIDI_GADGET=y -CONFIG_USB_G_PRINTER=y -CONFIG_USB_CDC_COMPOSITE=y -CONFIG_USB_G_NOKIA=y -CONFIG_USB_G_ACM_MS=y +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set # CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=y -CONFIG_USB_G_DBGP=y -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set CONFIG_USB_RAW_GADGET=y # end of USB Gadget precomposed configurations diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index 93fc14159..8b35b41fe 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -5829,34 +5829,24 @@ CONFIG_USB_CONFIGFS_F_TCM=y # # USB Gadget precomposed configurations # -CONFIG_USB_ZERO=y -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_AUDIO=y -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_G_NCM is not set CONFIG_USB_GADGETFS=y -CONFIG_USB_FUNCTIONFS=y -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_USB_GADGET_TARGET=y -CONFIG_USB_G_SERIAL=y -CONFIG_USB_MIDI_GADGET=y -CONFIG_USB_G_PRINTER=y -CONFIG_USB_CDC_COMPOSITE=y -CONFIG_USB_G_NOKIA=y -CONFIG_USB_G_ACM_MS=y +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set # CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=y -CONFIG_USB_G_DBGP=y -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set CONFIG_USB_RAW_GADGET=y # end of USB Gadget precomposed configurations diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config index 8abd5f0f0..c2f274e7a 100644 --- a/dashboard/config/linux/upstream-leak.config +++ b/dashboard/config/linux/upstream-leak.config @@ -5969,34 +5969,24 @@ CONFIG_USB_CONFIGFS_F_TCM=y # # USB Gadget precomposed configurations # -CONFIG_USB_ZERO=y -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_AUDIO=y -CONFIG_GADGET_UAC1=y -# CONFIG_GADGET_UAC1_LEGACY is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=y +# CONFIG_USB_ZERO is not set +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_G_NCM is not set CONFIG_USB_GADGETFS=y -CONFIG_USB_FUNCTIONFS=y -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_USB_GADGET_TARGET=y -CONFIG_USB_G_SERIAL=y -CONFIG_USB_MIDI_GADGET=y -CONFIG_USB_G_PRINTER=y -CONFIG_USB_CDC_COMPOSITE=y -CONFIG_USB_G_NOKIA=y -CONFIG_USB_G_ACM_MS=y +# CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_MASS_STORAGE is not set +# CONFIG_USB_GADGET_TARGET is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +# CONFIG_USB_CDC_COMPOSITE is not set +# CONFIG_USB_G_NOKIA is not set +# CONFIG_USB_G_ACM_MS is not set # CONFIG_USB_G_MULTI is not set -CONFIG_USB_G_HID=y -CONFIG_USB_G_DBGP=y -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=y +# CONFIG_USB_G_HID is not set +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set CONFIG_USB_RAW_GADGET=y # end of USB Gadget precomposed configurations -- cgit mrf-deployment