mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
9ce7aa325e
* Refreshed patches. * Patches made redundant by changes upstream: - target/linux/ramips/patches-4.14/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch * Patches accepted upstream: - target/linux/apm821xx/patches-4.14/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - target/linux/apm821xx/patches-4.14/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - target/linux/brcm63xx/patches-4.14/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - target/linux/brcm63xx/patches-4.14/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - target/linux/generic/backport-4.14/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - target/linux/generic/pending-4.14/900-gen_stats-fix-netlink-stats-padding.patch The ext4 regression introduced in 4.14.55 has been fixed by 4.14.60 (commit f547aa20b4f61662ad3e1a2040bb3cc5778f19b0). Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Thanks to Stijn Tintel for the CVE list :-). Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
--- a/drivers/ata/libata-core.c
|
|
+++ b/drivers/ata/libata-core.c
|
|
@@ -1599,6 +1599,14 @@ unsigned ata_exec_internal_sg(struct ata
|
|
return AC_ERR_SYSTEM;
|
|
}
|
|
|
|
+ if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) {
|
|
+ spin_unlock_irqrestore(ap->lock, flags);
|
|
+ if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) {
|
|
+ return AC_ERR_TIMEOUT;
|
|
+ }
|
|
+ spin_lock_irqsave(ap->lock, flags);
|
|
+ }
|
|
+
|
|
/* initialize internal qc */
|
|
|
|
/* XXX: Tag 0 is used for drivers with legacy EH as some
|
|
@@ -5127,6 +5135,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
|
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
|
|
return NULL;
|
|
|
|
+ if (ap->ops->qc_new && ap->ops->qc_new(ap))
|
|
+ return NULL;
|
|
+
|
|
/* libsas case */
|
|
if (ap->flags & ATA_FLAG_SAS_HOST) {
|
|
tag = ata_sas_allocate_tag(ap);
|
|
@@ -5172,6 +5183,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);
|
|
+ if (ap->ops->qc_free)
|
|
+ ap->ops->qc_free(qc);
|
|
}
|
|
}
|
|
|
|
--- a/include/linux/libata.h
|
|
+++ b/include/linux/libata.h
|
|
@@ -919,6 +919,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);
|
|
+ int (*qc_new)(struct ata_port *ap);
|
|
+ void (*qc_free)(struct ata_queued_cmd *qc);
|
|
|
|
/*
|
|
* Configuration and exception handling
|
|
@@ -1009,6 +1011,9 @@ struct ata_port_operations {
|
|
void (*phy_reset)(struct ata_port *ap);
|
|
void (*eng_timeout)(struct ata_port *ap);
|
|
|
|
+ int (*acquire_hw)(struct ata_port *ap, int may_sleep,
|
|
+ int timeout_jiffies);
|
|
+
|
|
/*
|
|
* ->inherits must be the last field and all the preceding
|
|
* fields must be pointers.
|