diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:19:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 19:22:23 +0200 |
| commit | f4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch) | |
| tree | 964f8813945913a7eaba920bda6a40be30516364 /target/linux/oxnas | |
| parent | 73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff) | |
| download | upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2 upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.14/999-libata-hacks.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch index 29132befb5..bcd1e76c24 100644 --- a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c -@@ -1599,6 +1599,14 @@ unsigned ata_exec_internal_sg(struct ata +@@ -1598,6 +1598,14 @@ unsigned ata_exec_internal_sg(struct ata return AC_ERR_SYSTEM; } @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -5131,6 +5139,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5130,6 +5138,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -5176,6 +5187,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5175,6 +5186,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -919,6 +919,8 @@ struct ata_port_operations { +@@ -922,6 +922,8 @@ struct ata_port_operations { void (*qc_prep)(struct ata_queued_cmd *qc); unsigned int (*qc_issue)(struct ata_queued_cmd *qc); bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -1009,6 +1011,9 @@ struct ata_port_operations { +@@ -1012,6 +1014,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |