diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-03 21:22:08 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-05 15:02:47 +0200 |
commit | 1f8d9f70c259a5702c4a7646754ccad6add5d9ab (patch) | |
tree | e7738d25b01ffb9b31f3d5f7d4c01ca1d4c699b2 /target/linux/generic/pending-4.14/834-ledtrig-libata.patch | |
parent | d37f8a60f079d424901bc55ebd19e58505631c48 (diff) | |
download | upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.gz upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.bz2 upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.zip |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: x86
Build tested: x86
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/834-ledtrig-libata.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/834-ledtrig-libata.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch index f59085b51c..8a15efdc0e 100644 --- a/target/linux/generic/pending-4.14/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-4.14/834-ledtrig-libata.patch @@ -45,7 +45,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> depends on ACPI --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c -@@ -731,6 +731,19 @@ u64 ata_tf_read_block(const struct ata_t +@@ -730,6 +730,19 @@ u64 ata_tf_read_block(const struct ata_t return block; } @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -5124,6 +5137,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5123,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> qc = __ata_qc_from_tag(ap, tag); qc->tag = tag; -@@ -6025,6 +6041,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -6024,6 +6040,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ata_sff_port_init(ap); return ap; -@@ -6046,6 +6065,12 @@ static void ata_host_release(struct devi +@@ -6045,6 +6064,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> kfree(ap); host->ports[i] = NULL; } -@@ -6492,7 +6517,23 @@ int ata_host_register(struct ata_host *h +@@ -6491,7 +6516,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } @@ -124,17 +124,17 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> rc = ata_tport_add(host->dev,host->ports[i]); --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -38,6 +38,9 @@ - #include <linux/acpi.h> +@@ -39,6 +39,9 @@ #include <linux/cdrom.h> #include <linux/sched.h> + #include <linux/async.h> +#ifdef CONFIG_ATA_LEDS +#include <linux/leds.h> +#endif /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -890,6 +893,12 @@ struct ata_port { +@@ -893,6 +896,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif |