diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2017-08-17 13:21:21 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-08-17 14:31:45 +0200 |
| commit | 364befeccf01c07049b492d90e98c2c13457c7c3 (patch) | |
| tree | 911e05589cbc75031713804d0d0767d95a075a05 /target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch | |
| parent | 2d02a4f5bda4a5ff392286360ec7d1129bd77d25 (diff) | |
| download | upstream-364befeccf01c07049b492d90e98c2c13457c7c3.tar.gz upstream-364befeccf01c07049b492d90e98c2c13457c7c3.tar.bz2 upstream-364befeccf01c07049b492d90e98c2c13457c7c3.zip | |
kernel: update 4.4 to 4.4.83
Refresh patches.
Minor update 704-phy-no-genphy-soft-reset.patch which was partially
accepted upstream.
Compile-tested on ar71xx.
Runtime-tested on ar71xx.
Fixes the following vulnerabilities:
- CVE-2017-7533 (4.4.80)
- CVE-2017-1000111 (4.4.82)
- CVE-2017-1000112 (4.4.82)
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
[cleanup commit message, add compile/runtime tested]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch index f22bf804ef..c990681067 100644 --- a/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch @@ -1,7 +1,7 @@ --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c -@@ -97,6 +97,8 @@ struct amd_chipset_type { +@@ -98,6 +98,8 @@ struct amd_chipset_type { u8 rev; }; @@ -10,7 +10,7 @@ static struct amd_chipset_info { struct pci_dev *nb_dev; struct pci_dev *smbus_dev; -@@ -450,6 +452,10 @@ void usb_amd_dev_put(void) +@@ -457,6 +459,10 @@ void usb_amd_dev_put(void) } EXPORT_SYMBOL_GPL(usb_amd_dev_put); @@ -21,7 +21,7 @@ /* * Make sure the controller is completely inactive, unable to * generate interrupts or do DMA. -@@ -529,8 +535,17 @@ reset_needed: +@@ -536,8 +542,17 @@ reset_needed: uhci_reset_hc(pdev, base); return 1; } @@ -39,7 +39,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -1095,3 +1110,4 @@ static void quirk_usb_early_handoff(stru +@@ -1102,3 +1117,4 @@ static void quirk_usb_early_handoff(stru } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); |