diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-10-20 14:57:03 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-10-21 10:22:10 +0200 |
| commit | 414912f56237e142136369e82c4937ffb27e3d4a (patch) | |
| tree | 66048ecfba284bf63bcc9ed3b604bbfb5f8025e0 /dashboard/config/linux/bits | |
| parent | d7941fd3d9bb5a2f3b5fdbed144cc13cdaf7f5b8 (diff) | |
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
Diffstat (limited to 'dashboard/config/linux/bits')
| -rw-r--r-- | dashboard/config/linux/bits/base.yml | 20 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/usb.yml | 22 |
2 files changed, 21 insertions, 21 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 |
