From: Sasha Levin Date: Sun, 23 Jan 2022 14:49:18 +0000 (-0500) Subject: Fixes for 4.14 X-Git-Tag: v4.4.300~132^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22bcc10d27c1345e1c8a8677d90b788dbfd3340d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/acpica-actypes.h-expand-the-acpi_access_-definitions.patch b/queue-4.14/acpica-actypes.h-expand-the-acpi_access_-definitions.patch new file mode 100644 index 00000000000..35e70967e30 --- /dev/null +++ b/queue-4.14/acpica-actypes.h-expand-the-acpi_access_-definitions.patch @@ -0,0 +1,56 @@ +From c03a0f2ea8c89acd364396c29624c3a4a2a690f6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 16:57:34 +0100 +Subject: ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions + +From: Mark Langsdorf + +[ Upstream commit f81bdeaf816142e0729eea0cc84c395ec9673151 ] + +ACPICA commit bc02c76d518135531483dfc276ed28b7ee632ce1 + +The current ACPI_ACCESS_*_WIDTH defines do not provide a way to +test that size is small enough to not cause an overflow when +applied to a 32-bit integer. + +Rather than adding more magic numbers, add ACPI_ACCESS_*_SHIFT, +ACPI_ACCESS_*_MAX, and ACPI_ACCESS_*_DEFAULT #defines and +redefine ACPI_ACCESS_*_WIDTH in terms of the new #defines. + +This was inititally reported on Linux where a size of 102 in +ACPI_ACCESS_BIT_WIDTH caused an overflow error in the SPCR +initialization code. + +Link: https://github.com/acpica/acpica/commit/bc02c76d +Signed-off-by: Mark Langsdorf +Signed-off-by: Bob Moore +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + include/acpi/actypes.h | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h +index 71fadbe77e211..2c5df69e67819 100644 +--- a/include/acpi/actypes.h ++++ b/include/acpi/actypes.h +@@ -560,8 +560,14 @@ typedef u64 acpi_integer; + * Can be used with access_width of struct acpi_generic_address and access_size of + * struct acpi_resource_generic_register. + */ +-#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + 2)) +-#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) - 1)) ++#define ACPI_ACCESS_BIT_SHIFT 2 ++#define ACPI_ACCESS_BYTE_SHIFT -1 ++#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT) ++#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT) ++#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT) ++#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT) ++#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT)) ++#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT)) + + /******************************************************************************* + * +-- +2.34.1 + diff --git a/queue-4.14/acpica-executer-fix-the-refclass_refof-case-in-acpi_.patch b/queue-4.14/acpica-executer-fix-the-refclass_refof-case-in-acpi_.patch new file mode 100644 index 00000000000..2ad0bbd6084 --- /dev/null +++ b/queue-4.14/acpica-executer-fix-the-refclass_refof-case-in-acpi_.patch @@ -0,0 +1,57 @@ +From fe142a4c9d724ebf358659745512502c57949ebc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 17:31:05 +0100 +Subject: ACPICA: Executer: Fix the REFCLASS_REFOF case in + acpi_ex_opcode_1A_0T_1R() + +From: Rafael J. Wysocki + +[ Upstream commit 24ea5f90ec9548044a6209685c5010edd66ffe8f ] + +ACPICA commit d984f12041392fa4156b52e2f7e5c5e7bc38ad9e + +If Operand[0] is a reference of the ACPI_REFCLASS_REFOF class, +acpi_ex_opcode_1A_0T_1R () calls acpi_ns_get_attached_object () to +obtain return_desc which may require additional resolution with +the help of acpi_ex_read_data_from_field (). If the latter fails, +the reference counter of the original return_desc is decremented +which is incorrect, because acpi_ns_get_attached_object () does not +increment the reference counter of the object returned by it. + +This issue may lead to premature deletion of the attached object +while it is still attached and a use-after-free and crash in the +host OS. For example, this may happen when on evaluation of ref_of() +a local region field where there is no registered handler for the +given Operation Region. + +Fix it by making acpi_ex_opcode_1A_0T_1R () return Status right away +after a acpi_ex_read_data_from_field () failure. + +Link: https://github.com/acpica/acpica/commit/d984f120 +Link: https://github.com/acpica/acpica/pull/685 +Reported-by: Lenny Szubowicz +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Bob Moore +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/exoparg1.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c +index f787651348c11..9f4dbdb70111a 100644 +--- a/drivers/acpi/acpica/exoparg1.c ++++ b/drivers/acpi/acpica/exoparg1.c +@@ -1041,7 +1041,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) + (walk_state, return_desc, + &temp_desc); + if (ACPI_FAILURE(status)) { +- goto cleanup; ++ return_ACPI_STATUS ++ (status); + } + + return_desc = temp_desc; +-- +2.34.1 + diff --git a/queue-4.14/acpica-hardware-do-not-flush-cpu-cache-when-entering.patch b/queue-4.14/acpica-hardware-do-not-flush-cpu-cache-when-entering.patch new file mode 100644 index 00000000000..a1b08b81161 --- /dev/null +++ b/queue-4.14/acpica-hardware-do-not-flush-cpu-cache-when-entering.patch @@ -0,0 +1,82 @@ +From cf7f32fce98a25bc439ea66b40865cff2dae0197 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 17:33:51 +0100 +Subject: ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5 + +From: Kirill A. Shutemov + +[ Upstream commit 1d4e0b3abb168b2ee1eca99c527cffa1b80b6161 ] + +ACPICA commit 3dd7e1f3996456ef81bfe14cba29860e8d42949e + +According to ACPI 6.4, Section 16.2, the CPU cache flushing is +required on entering to S1, S2, and S3, but the ACPICA code +flushes the CPU cache regardless of the sleep state. + +Blind cache flush on entering S5 causes problems for TDX. + +Flushing happens with WBINVD that is not supported in the TDX +environment. + +TDX only supports S5 and adjusting ACPICA code to conform to the +spec more strictly fixes the issue. + +Link: https://github.com/acpica/acpica/commit/3dd7e1f3 +Signed-off-by: Kirill A. Shutemov +[ rjw: Subject and changelog edits ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Bob Moore +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/hwesleep.c | 4 +++- + drivers/acpi/acpica/hwsleep.c | 4 +++- + drivers/acpi/acpica/hwxfsleep.c | 2 -- + 3 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/acpi/acpica/hwesleep.c b/drivers/acpi/acpica/hwesleep.c +index 7f8c57177819f..45b392fa36657 100644 +--- a/drivers/acpi/acpica/hwesleep.c ++++ b/drivers/acpi/acpica/hwesleep.c +@@ -138,7 +138,9 @@ acpi_status acpi_hw_extended_sleep(u8 sleep_state) + + /* Flush caches, as per ACPI specification */ + +- ACPI_FLUSH_CPU_CACHE(); ++ if (sleep_state < ACPI_STATE_S4) { ++ ACPI_FLUSH_CPU_CACHE(); ++ } + + status = acpi_os_enter_sleep(sleep_state, sleep_control, 0); + if (status == AE_CTRL_TERMINATE) { +diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c +index 2c54d08b20ca6..9e50529bb3cc9 100644 +--- a/drivers/acpi/acpica/hwsleep.c ++++ b/drivers/acpi/acpica/hwsleep.c +@@ -149,7 +149,9 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) + + /* Flush caches, as per ACPI specification */ + +- ACPI_FLUSH_CPU_CACHE(); ++ if (sleep_state < ACPI_STATE_S4) { ++ ACPI_FLUSH_CPU_CACHE(); ++ } + + status = acpi_os_enter_sleep(sleep_state, pm1a_control, pm1b_control); + if (status == AE_CTRL_TERMINATE) { +diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c +index 827c3242225d9..b3c7736611908 100644 +--- a/drivers/acpi/acpica/hwxfsleep.c ++++ b/drivers/acpi/acpica/hwxfsleep.c +@@ -223,8 +223,6 @@ acpi_status acpi_enter_sleep_state_s4bios(void) + return_ACPI_STATUS(status); + } + +- ACPI_FLUSH_CPU_CACHE(); +- + status = acpi_hw_write_port(acpi_gbl_FADT.smi_command, + (u32)acpi_gbl_FADT.s4_bios_request, 8); + +-- +2.34.1 + diff --git a/queue-4.14/acpica-utilities-avoid-deleting-the-same-object-twic.patch b/queue-4.14/acpica-utilities-avoid-deleting-the-same-object-twic.patch new file mode 100644 index 00000000000..09d83471d50 --- /dev/null +++ b/queue-4.14/acpica-utilities-avoid-deleting-the-same-object-twic.patch @@ -0,0 +1,48 @@ +From f471f5d340b689e5348dc512a612b5f76326306d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 17:29:45 +0100 +Subject: ACPICA: Utilities: Avoid deleting the same object twice in a row + +From: Rafael J. Wysocki + +[ Upstream commit 1cdfe9e346b4c5509ffe19ccde880fd259d9f7a3 ] + +ACPICA commit c11af67d8f7e3d381068ce7771322f2b5324d687 + +If original_count is 0 in acpi_ut_update_ref_count (), +acpi_ut_delete_internal_obj () is invoked for the target object, which is +incorrect, because that object has been deleted once already and the +memory allocated to store it may have been reclaimed and allocated +for a different purpose by the host OS. Moreover, a confusing debug +message following the "Reference Count is already zero, cannot +decrement" warning is printed in that case. + +To fix this issue, make acpi_ut_update_ref_count () return after finding +that original_count is 0 and printing the above warning. + +Link: https://github.com/acpica/acpica/commit/c11af67d +Link: https://github.com/acpica/acpica/pull/652 +Reported-by: Mark Asselstine +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Bob Moore +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/utdelete.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c +index 61a979d0fbc5a..64a90ba71f18c 100644 +--- a/drivers/acpi/acpica/utdelete.c ++++ b/drivers/acpi/acpica/utdelete.c +@@ -442,6 +442,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) + ACPI_WARNING((AE_INFO, + "Obj %p, Reference Count is already zero, cannot decrement\n", + object)); ++ return; + } + + ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, +-- +2.34.1 + diff --git a/queue-4.14/alsa-hda-add-missing-rwsem-around-snd_ctl_remove-cal.patch b/queue-4.14/alsa-hda-add-missing-rwsem-around-snd_ctl_remove-cal.patch new file mode 100644 index 00000000000..f1341522d86 --- /dev/null +++ b/queue-4.14/alsa-hda-add-missing-rwsem-around-snd_ctl_remove-cal.patch @@ -0,0 +1,40 @@ +From 5029138d03e74abb88fd5017a2a5659f09e05076 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Nov 2021 08:13:14 +0100 +Subject: ALSA: hda: Add missing rwsem around snd_ctl_remove() calls + +From: Takashi Iwai + +[ Upstream commit 80bd64af75b4bb11c0329bc66c35da2ddfb66d88 ] + +snd_ctl_remove() has to be called with card->controls_rwsem held (when +called after the card instantiation). This patch add the missing +rwsem calls around it. + +Fixes: d13bd412dce2 ("ALSA: hda - Manage kcontrol lists") +Link: https://lore.kernel.org/r/20211116071314.15065-3-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/hda_codec.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index a56f018d586f5..8ec73955170b4 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -1680,8 +1680,11 @@ void snd_hda_ctls_clear(struct hda_codec *codec) + { + int i; + struct hda_nid_item *items = codec->mixers.list; ++ ++ down_write(&codec->card->controls_rwsem); + for (i = 0; i < codec->mixers.used; i++) + snd_ctl_remove(codec->card, items[i].kctl); ++ up_write(&codec->card->controls_rwsem); + snd_array_free(&codec->mixers); + snd_array_free(&codec->nids); + } +-- +2.34.1 + diff --git a/queue-4.14/alsa-jack-add-missing-rwsem-around-snd_ctl_remove-ca.patch b/queue-4.14/alsa-jack-add-missing-rwsem-around-snd_ctl_remove-ca.patch new file mode 100644 index 00000000000..1001d25ca65 --- /dev/null +++ b/queue-4.14/alsa-jack-add-missing-rwsem-around-snd_ctl_remove-ca.patch @@ -0,0 +1,42 @@ +From 9e528603f56bc856f5fd94624666fd5320bb0993 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Nov 2021 08:13:12 +0100 +Subject: ALSA: jack: Add missing rwsem around snd_ctl_remove() calls + +From: Takashi Iwai + +[ Upstream commit 06764dc931848c3a9bc01a63bbf76a605408bb54 ] + +snd_ctl_remove() has to be called with card->controls_rwsem held (when +called after the card instantiation). This patch add the missing +rwsem calls around it. + +Fixes: 9058cbe1eed2 ("ALSA: jack: implement kctl creating for jack devices") +Link: https://lore.kernel.org/r/20211116071314.15065-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/core/jack.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/core/jack.c b/sound/core/jack.c +index 5ddf81f091fa9..36cfe1c54109d 100644 +--- a/sound/core/jack.c ++++ b/sound/core/jack.c +@@ -68,10 +68,13 @@ static int snd_jack_dev_free(struct snd_device *device) + struct snd_card *card = device->card; + struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl; + ++ down_write(&card->controls_rwsem); + list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) { + list_del_init(&jack_kctl->list); + snd_ctl_remove(card, jack_kctl->kctl); + } ++ up_write(&card->controls_rwsem); ++ + if (jack->private_free) + jack->private_free(jack); + +-- +2.34.1 + diff --git a/queue-4.14/alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch b/queue-4.14/alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch new file mode 100644 index 00000000000..6977838e64e --- /dev/null +++ b/queue-4.14/alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch @@ -0,0 +1,41 @@ +From fa080c8dfbbd139c9d1363b768fab04c6c6491f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 16:58:54 +0800 +Subject: ALSA: oss: fix compile error when OSS_DEBUG is enabled + +From: Bixuan Cui + +[ Upstream commit 8e7daf318d97f25e18b2fc7eb5909e34cd903575 ] + +Fix compile error when OSS_DEBUG is enabled: + sound/core/oss/pcm_oss.c: In function 'snd_pcm_oss_set_trigger': + sound/core/oss/pcm_oss.c:2055:10: error: 'substream' undeclared (first + use in this function); did you mean 'csubstream'? + pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); + ^ + +Fixes: 61efcee8608c ("ALSA: oss: Use standard printk helpers") +Signed-off-by: Bixuan Cui +Link: https://lore.kernel.org/r/1638349134-110369-1-git-send-email-cuibixuan@linux.alibaba.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/core/oss/pcm_oss.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c +index b092f257c1c69..87806dab321a3 100644 +--- a/sound/core/oss/pcm_oss.c ++++ b/sound/core/oss/pcm_oss.c +@@ -2070,7 +2070,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr + int err, cmd; + + #ifdef OSS_DEBUG +- pcm_dbg(substream->pcm, "pcm_oss: trigger = 0x%x\n", trigger); ++ pr_debug("pcm_oss: trigger = 0x%x\n", trigger); + #endif + + psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK]; +-- +2.34.1 + diff --git a/queue-4.14/alsa-pcm-add-missing-rwsem-around-snd_ctl_remove-cal.patch b/queue-4.14/alsa-pcm-add-missing-rwsem-around-snd_ctl_remove-cal.patch new file mode 100644 index 00000000000..cb40a4c51d4 --- /dev/null +++ b/queue-4.14/alsa-pcm-add-missing-rwsem-around-snd_ctl_remove-cal.patch @@ -0,0 +1,41 @@ +From 3e8b1623c33d589c47beee885690efb03a2dc744 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Nov 2021 08:13:13 +0100 +Subject: ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls + +From: Takashi Iwai + +[ Upstream commit 5471e9762e1af4b7df057a96bfd46cc250979b88 ] + +snd_ctl_remove() has to be called with card->controls_rwsem held (when +called after the card instantiation). This patch add the missing +rwsem calls around it. + +Fixes: a8ff48cb7083 ("ALSA: pcm: Free chmap at PCM free callback, too") +Link: https://lore.kernel.org/r/20211116071314.15065-2-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/core/pcm.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/sound/core/pcm.c b/sound/core/pcm.c +index 2b5caa8dea2e2..a228bf9331102 100644 +--- a/sound/core/pcm.c ++++ b/sound/core/pcm.c +@@ -875,7 +875,11 @@ EXPORT_SYMBOL(snd_pcm_new_internal); + static void free_chmap(struct snd_pcm_str *pstr) + { + if (pstr->chmap_kctl) { +- snd_ctl_remove(pstr->pcm->card, pstr->chmap_kctl); ++ struct snd_card *card = pstr->pcm->card; ++ ++ down_write(&card->controls_rwsem); ++ snd_ctl_remove(card, pstr->chmap_kctl); ++ up_write(&card->controls_rwsem); + pstr->chmap_kctl = NULL; + } + } +-- +2.34.1 + diff --git a/queue-4.14/alsa-seq-set-upper-limit-of-processed-events.patch b/queue-4.14/alsa-seq-set-upper-limit-of-processed-events.patch new file mode 100644 index 00000000000..4c3dfe22767 --- /dev/null +++ b/queue-4.14/alsa-seq-set-upper-limit-of-processed-events.patch @@ -0,0 +1,87 @@ +From f3c8d48e2c855616e2b3abc1fec984d10afefe6f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Dec 2021 17:51:46 +0100 +Subject: ALSA: seq: Set upper limit of processed events + +From: Takashi Iwai + +[ Upstream commit 6fadb494a638d8b8a55864ecc6ac58194f03f327 ] + +Currently ALSA sequencer core tries to process the queued events as +much as possible when they become dispatchable. If applications try +to queue too massive events to be processed at the very same timing, +the sequencer core would still try to process such all events, either +in the interrupt context or via some notifier; in either away, it +might be a cause of RCU stall or such problems. + +As a potential workaround for those problems, this patch adds the +upper limit of the amount of events to be processed. The remaining +events are processed in the next batch, so they won't be lost. + +For the time being, it's limited up to 1000 events per queue, which +should be high enough for any normal usages. + +Reported-by: Zqiang +Reported-by: syzbot+bb950e68b400ab4f65f8@syzkaller.appspotmail.com +Link: https://lore.kernel.org/r/20211102033222.3849-1-qiang.zhang1211@gmail.com +Link: https://lore.kernel.org/r/20211207165146.2888-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/core/seq/seq_queue.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c +index ea1aa07962761..b923059a22276 100644 +--- a/sound/core/seq/seq_queue.c ++++ b/sound/core/seq/seq_queue.c +@@ -257,12 +257,15 @@ struct snd_seq_queue *snd_seq_queue_find_name(char *name) + + /* -------------------------------------------------------- */ + ++#define MAX_CELL_PROCESSES_IN_QUEUE 1000 ++ + void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) + { + unsigned long flags; + struct snd_seq_event_cell *cell; + snd_seq_tick_time_t cur_tick; + snd_seq_real_time_t cur_time; ++ int processed = 0; + + if (q == NULL) + return; +@@ -285,6 +288,8 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) + if (!cell) + break; + snd_seq_dispatch_event(cell, atomic, hop); ++ if (++processed >= MAX_CELL_PROCESSES_IN_QUEUE) ++ goto out; /* the rest processed at the next batch */ + } + + /* Process time queue... */ +@@ -294,14 +299,19 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) + if (!cell) + break; + snd_seq_dispatch_event(cell, atomic, hop); ++ if (++processed >= MAX_CELL_PROCESSES_IN_QUEUE) ++ goto out; /* the rest processed at the next batch */ + } + ++ out: + /* free lock */ + spin_lock_irqsave(&q->check_lock, flags); + if (q->check_again) { + q->check_again = 0; +- spin_unlock_irqrestore(&q->check_lock, flags); +- goto __again; ++ if (processed < MAX_CELL_PROCESSES_IN_QUEUE) { ++ spin_unlock_irqrestore(&q->check_lock, flags); ++ goto __again; ++ } + } + q->check_blocked = 0; + spin_unlock_irqrestore(&q->check_lock, flags); +-- +2.34.1 + diff --git a/queue-4.14/ar5523-fix-null-ptr-deref-with-unexpected-wdcmsg_tar.patch b/queue-4.14/ar5523-fix-null-ptr-deref-with-unexpected-wdcmsg_tar.patch new file mode 100644 index 00000000000..ec5e9289d4f --- /dev/null +++ b/queue-4.14/ar5523-fix-null-ptr-deref-with-unexpected-wdcmsg_tar.patch @@ -0,0 +1,63 @@ +From b47e7c28f7b63cd96694bbbaec16b5289d221e4a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Oct 2021 18:37:49 -0400 +Subject: ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply + +From: Zekun Shen + +[ Upstream commit ae80b6033834342601e99f74f6a62ff5092b1cee ] + +Unexpected WDCMSG_TARGET_START replay can lead to null-ptr-deref +when ar->tx_cmd->odata is NULL. The patch adds a null check to +prevent such case. + +KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] + ar5523_cmd+0x46a/0x581 [ar5523] + ar5523_probe.cold+0x1b7/0x18da [ar5523] + ? ar5523_cmd_rx_cb+0x7a0/0x7a0 [ar5523] + ? __pm_runtime_set_status+0x54a/0x8f0 + ? _raw_spin_trylock_bh+0x120/0x120 + ? pm_runtime_barrier+0x220/0x220 + ? __pm_runtime_resume+0xb1/0xf0 + usb_probe_interface+0x25b/0x710 + really_probe+0x209/0x5d0 + driver_probe_device+0xc6/0x1b0 + device_driver_attach+0xe2/0x120 + +I found the bug using a custome USBFuzz port. It's a research work +to fuzz USB stack/drivers. I modified it to fuzz ath9k driver only, +providing hand-crafted usb descriptors to QEMU. + +After fixing the code (fourth byte in usb packet) to WDCMSG_TARGET_START, +I got the null-ptr-deref bug. I believe the bug is triggerable whenever +cmd->odata is NULL. After patching, I tested with the same input and no +longer see the KASAN report. + +This was NOT tested on a real device. + +Signed-off-by: Zekun Shen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/YXsmPQ3awHFLuAj2@10-18-43-117.dynapool.wireless.nyu.edu +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ar5523/ar5523.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c +index e1a1d27427cc9..bf43244f051c5 100644 +--- a/drivers/net/wireless/ath/ar5523/ar5523.c ++++ b/drivers/net/wireless/ath/ar5523/ar5523.c +@@ -153,6 +153,10 @@ static void ar5523_cmd_rx_cb(struct urb *urb) + ar5523_err(ar, "Invalid reply to WDCMSG_TARGET_START"); + return; + } ++ if (!cmd->odata) { ++ ar5523_err(ar, "Unexpected WDCMSG_TARGET_START reply"); ++ return; ++ } + memcpy(cmd->odata, hdr + 1, sizeof(u32)); + cmd->olen = sizeof(u32); + cmd->res = 0; +-- +2.34.1 + diff --git a/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch b/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch new file mode 100644 index 00000000000..bb41bdb771a --- /dev/null +++ b/queue-4.14/arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch @@ -0,0 +1,121 @@ +From d8ac36c7a8a3832f3fd81898db361cc33f1846e8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Oct 2021 16:19:33 +0200 +Subject: ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART + +From: Lukas Bulwahn + +[ Upstream commit b0100bce4ff82ec1ccd3c1f3d339fd2df6a81784 ] + +Since commit 4b563a066611 ("ARM: imx: Remove imx21 support"), the config +DEBUG_IMX21_IMX27_UART is really only debug support for IMX27. + +So, rename this option to DEBUG_IMX27_UART and adjust dependencies in +Kconfig and rename the definitions to IMX27 as further clean-up. + +This issue was discovered with ./scripts/checkkconfigsymbols.py, which +reported that DEBUG_IMX21_IMX27_UART depends on the non-existing config +SOC_IMX21. + +Signed-off-by: Lukas Bulwahn +Reviewed-by: Arnd Bergmann +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + arch/arm/Kconfig.debug | 14 +++++++------- + arch/arm/include/debug/imx-uart.h | 18 +++++++++--------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug +index d6cf18a0cb0a9..b70ed4c7691e5 100644 +--- a/arch/arm/Kconfig.debug ++++ b/arch/arm/Kconfig.debug +@@ -363,12 +363,12 @@ choice + Say Y here if you want kernel low-level debugging support + on i.MX25. + +- config DEBUG_IMX21_IMX27_UART +- bool "i.MX21 and i.MX27 Debug UART" +- depends on SOC_IMX21 || SOC_IMX27 ++ config DEBUG_IMX27_UART ++ bool "i.MX27 Debug UART" ++ depends on SOC_IMX27 + help + Say Y here if you want kernel low-level debugging support +- on i.MX21 or i.MX27. ++ on i.MX27. + + config DEBUG_IMX28_UART + bool "i.MX28 Debug UART" +@@ -1398,7 +1398,7 @@ config DEBUG_IMX_UART_PORT + int "i.MX Debug UART Port Selection" + depends on DEBUG_IMX1_UART || \ + DEBUG_IMX25_UART || \ +- DEBUG_IMX21_IMX27_UART || \ ++ DEBUG_IMX27_UART || \ + DEBUG_IMX31_UART || \ + DEBUG_IMX35_UART || \ + DEBUG_IMX50_UART || \ +@@ -1451,12 +1451,12 @@ config DEBUG_LL_INCLUDE + default "debug/icedcc.S" if DEBUG_ICEDCC + default "debug/imx.S" if DEBUG_IMX1_UART || \ + DEBUG_IMX25_UART || \ +- DEBUG_IMX21_IMX27_UART || \ ++ DEBUG_IMX27_UART || \ + DEBUG_IMX31_UART || \ + DEBUG_IMX35_UART || \ + DEBUG_IMX50_UART || \ + DEBUG_IMX51_UART || \ +- DEBUG_IMX53_UART ||\ ++ DEBUG_IMX53_UART || \ + DEBUG_IMX6Q_UART || \ + DEBUG_IMX6SL_UART || \ + DEBUG_IMX6SX_UART || \ +diff --git a/arch/arm/include/debug/imx-uart.h b/arch/arm/include/debug/imx-uart.h +index bce58e975ad1f..c750cc9876f6d 100644 +--- a/arch/arm/include/debug/imx-uart.h ++++ b/arch/arm/include/debug/imx-uart.h +@@ -14,13 +14,6 @@ + #define IMX1_UART_BASE_ADDR(n) IMX1_UART##n##_BASE_ADDR + #define IMX1_UART_BASE(n) IMX1_UART_BASE_ADDR(n) + +-#define IMX21_UART1_BASE_ADDR 0x1000a000 +-#define IMX21_UART2_BASE_ADDR 0x1000b000 +-#define IMX21_UART3_BASE_ADDR 0x1000c000 +-#define IMX21_UART4_BASE_ADDR 0x1000d000 +-#define IMX21_UART_BASE_ADDR(n) IMX21_UART##n##_BASE_ADDR +-#define IMX21_UART_BASE(n) IMX21_UART_BASE_ADDR(n) +- + #define IMX25_UART1_BASE_ADDR 0x43f90000 + #define IMX25_UART2_BASE_ADDR 0x43f94000 + #define IMX25_UART3_BASE_ADDR 0x5000c000 +@@ -29,6 +22,13 @@ + #define IMX25_UART_BASE_ADDR(n) IMX25_UART##n##_BASE_ADDR + #define IMX25_UART_BASE(n) IMX25_UART_BASE_ADDR(n) + ++#define IMX27_UART1_BASE_ADDR 0x1000a000 ++#define IMX27_UART2_BASE_ADDR 0x1000b000 ++#define IMX27_UART3_BASE_ADDR 0x1000c000 ++#define IMX27_UART4_BASE_ADDR 0x1000d000 ++#define IMX27_UART_BASE_ADDR(n) IMX27_UART##n##_BASE_ADDR ++#define IMX27_UART_BASE(n) IMX27_UART_BASE_ADDR(n) ++ + #define IMX31_UART1_BASE_ADDR 0x43f90000 + #define IMX31_UART2_BASE_ADDR 0x43f94000 + #define IMX31_UART3_BASE_ADDR 0x5000c000 +@@ -115,10 +115,10 @@ + + #ifdef CONFIG_DEBUG_IMX1_UART + #define UART_PADDR IMX_DEBUG_UART_BASE(IMX1) +-#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART) +-#define UART_PADDR IMX_DEBUG_UART_BASE(IMX21) + #elif defined(CONFIG_DEBUG_IMX25_UART) + #define UART_PADDR IMX_DEBUG_UART_BASE(IMX25) ++#elif defined(CONFIG_DEBUG_IMX27_UART) ++#define UART_PADDR IMX_DEBUG_UART_BASE(IMX27) + #elif defined(CONFIG_DEBUG_IMX31_UART) + #define UART_PADDR IMX_DEBUG_UART_BASE(IMX31) + #elif defined(CONFIG_DEBUG_IMX35_UART) +-- +2.34.1 + diff --git a/queue-4.14/arm64-dts-qcom-msm8916-fix-mmc-controller-aliases.patch b/queue-4.14/arm64-dts-qcom-msm8916-fix-mmc-controller-aliases.patch new file mode 100644 index 00000000000..76ad50a567f --- /dev/null +++ b/queue-4.14/arm64-dts-qcom-msm8916-fix-mmc-controller-aliases.patch @@ -0,0 +1,40 @@ +From cd6d9ad0590eb2732be0b52de7dca7ca323c91a7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 05:05:59 +0300 +Subject: arm64: dts: qcom: msm8916: fix MMC controller aliases + +From: Dmitry Baryshkov + +[ Upstream commit b0293c19d42f6d6951c2fab9a47fed50baf2c14d ] + +Change sdhcN aliases to mmcN to make them actually work. Currently the +board uses non-standard aliases sdhcN, which do not work, resulting in +mmc0 and mmc1 hosts randomly changing indices between boots. + +Fixes: c4da5a561627 ("arm64: dts: qcom: Add msm8916 sdhci configuration nodes") +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Bjorn Andersson +Link: https://lore.kernel.org/r/20211201020559.1611890-1-dmitry.baryshkov@linaro.org +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi +index 94697bab3805f..a961b81060004 100644 +--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi ++++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi +@@ -26,8 +26,8 @@ + #size-cells = <2>; + + aliases { +- sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ +- sdhc2 = &sdhc_2; /* SDC2 SD card slot */ ++ mmc0 = &sdhc_1; /* SDC1 eMMC slot */ ++ mmc1 = &sdhc_2; /* SDC2 SD card slot */ + }; + + chosen { }; +-- +2.34.1 + diff --git a/queue-4.14/arm64-tegra-adjust-length-of-ccplex-cluster-mmio-reg.patch b/queue-4.14/arm64-tegra-adjust-length-of-ccplex-cluster-mmio-reg.patch new file mode 100644 index 00000000000..33fa1fe0518 --- /dev/null +++ b/queue-4.14/arm64-tegra-adjust-length-of-ccplex-cluster-mmio-reg.patch @@ -0,0 +1,35 @@ +From e89e1ea94cd7da0815277360f8659635e92bd8f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Dec 2021 14:28:29 +0100 +Subject: arm64: tegra: Adjust length of CCPLEX cluster MMIO region + +From: Thierry Reding + +[ Upstream commit 2b14cbd643feea5fc17c6e8bead4e71088c69acd ] + +The Tegra186 CCPLEX cluster register region is 4 MiB is length, not 4 +MiB - 1. This was likely presumed to be the "limit" rather than length. +Fix it up. + +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi +index a9c3eef6c4e09..3307d816050fe 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi +@@ -351,7 +351,7 @@ + + ccplex@e000000 { + compatible = "nvidia,tegra186-ccplex-cluster"; +- reg = <0x0 0x0e000000 0x0 0x3fffff>; ++ reg = <0x0 0x0e000000 0x0 0x400000>; + + nvidia,bpmp = <&bpmp>; + }; +-- +2.34.1 + diff --git a/queue-4.14/asoc-mediatek-mt8173-fix-device_node-leak.patch b/queue-4.14/asoc-mediatek-mt8173-fix-device_node-leak.patch new file mode 100644 index 00000000000..ad7d1132ae7 --- /dev/null +++ b/queue-4.14/asoc-mediatek-mt8173-fix-device_node-leak.patch @@ -0,0 +1,78 @@ +From 3c561b2d94a2e199a8ceb1912a39db96b3fb767f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Dec 2021 14:47:16 +0800 +Subject: ASoC: mediatek: mt8173: fix device_node leak + +From: Tzung-Bi Shih + +[ Upstream commit 493433785df0075afc0c106ab65f10a605d0b35d ] + +Fixes the device_node leak. + +Signed-off-by: Tzung-Bi Shih +Link: https://lore.kernel.org/r/20211224064719.2031210-2-tzungbi@google.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 3 +++ + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 ++ + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 ++ + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 ++ + 4 files changed, 9 insertions(+) + +diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c +index e0c2b23ec7118..0adb7ded61e9c 100644 +--- a/sound/soc/mediatek/mt8173/mt8173-max98090.c ++++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c +@@ -177,6 +177,9 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); ++ ++ of_node_put(codec_node); ++ of_node_put(platform_node); + return ret; + } + +diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +index 99c15219dbc81..aa52e2f81760a 100644 +--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c ++++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +@@ -227,6 +227,8 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); ++ ++ of_node_put(platform_node); + return ret; + } + +diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +index 42de84ca8c844..61b0d8f8678e9 100644 +--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c ++++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +@@ -284,6 +284,8 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); ++ ++ of_node_put(platform_node); + return ret; + } + +diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c +index e69c141d8ed4c..3492c02f72c1a 100644 +--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c ++++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c +@@ -316,6 +316,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); ++ ++ of_node_put(platform_node); + return ret; + } + +-- +2.34.1 + diff --git a/queue-4.14/asoc-samsung-idma-check-of-ioremap-return-value.patch b/queue-4.14/asoc-samsung-idma-check-of-ioremap-return-value.patch new file mode 100644 index 00000000000..44e1c866d12 --- /dev/null +++ b/queue-4.14/asoc-samsung-idma-check-of-ioremap-return-value.patch @@ -0,0 +1,40 @@ +From 4f13a62ed53248a1d0b5aa9bea6ab75b6e6f6aa3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Dec 2021 11:40:26 +0800 +Subject: ASoC: samsung: idma: Check of ioremap return value + +From: Jiasheng Jiang + +[ Upstream commit 3ecb46755eb85456b459a1a9f952c52986bce8ec ] + +Because of the potential failure of the ioremap(), the buf->area could +be NULL. +Therefore, we need to check it and return -ENOMEM in order to transfer +the error. + +Fixes: f09aecd50f39 ("ASoC: SAMSUNG: Add I2S0 internal dma driver") +Signed-off-by: Jiasheng Jiang +Reviewed-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20211228034026.1659385-1-jiasheng@iscas.ac.cn +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/samsung/idma.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c +index a635df61f928c..2a6ffb2abb338 100644 +--- a/sound/soc/samsung/idma.c ++++ b/sound/soc/samsung/idma.c +@@ -369,6 +369,8 @@ static int preallocate_idma_buffer(struct snd_pcm *pcm, int stream) + buf->addr = idma.lp_tx_addr; + buf->bytes = idma_hardware.buffer_bytes_max; + buf->area = (unsigned char * __force)ioremap(buf->addr, buf->bytes); ++ if (!buf->area) ++ return -ENOMEM; + + return 0; + } +-- +2.34.1 + diff --git a/queue-4.14/ath10k-fix-tx-hanging.patch b/queue-4.14/ath10k-fix-tx-hanging.patch new file mode 100644 index 00000000000..bb9f9a6e948 --- /dev/null +++ b/queue-4.14/ath10k-fix-tx-hanging.patch @@ -0,0 +1,56 @@ +From c0c109f097bd4634a3a98b1ca5283a0f98167bc4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 May 2021 15:58:06 +0700 +Subject: ath10k: Fix tx hanging + +From: Sebastian Gottschall + +[ Upstream commit e8a91863eba3966a447d2daa1526082d52b5db2a ] + +While running stress tests in roaming scenarios (switching ap's every 5 +seconds, we discovered a issue which leads to tx hangings of exactly 5 +seconds while or after scanning for new accesspoints. We found out that +this hanging is triggered by ath10k_mac_wait_tx_complete since the +empty_tx_wq was not wake when the num_tx_pending counter reaches zero. +To fix this, we simply move the wake_up call to htt_tx_dec_pending, +since this call was missed on several locations within the ath10k code. + +Signed-off-by: Sebastian Gottschall +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20210505085806.11474-1-s.gottschall@dd-wrt.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/htt_tx.c | 3 +++ + drivers/net/wireless/ath/ath10k/txrx.c | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c +index 685faac1368fd..21f5fb68b2046 100644 +--- a/drivers/net/wireless/ath/ath10k/htt_tx.c ++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c +@@ -158,6 +158,9 @@ void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt) + htt->num_pending_tx--; + if (htt->num_pending_tx == htt->max_num_pending_tx - 1) + ath10k_mac_tx_unlock(htt->ar, ATH10K_TX_PAUSE_Q_FULL); ++ ++ if (htt->num_pending_tx == 0) ++ wake_up(&htt->empty_tx_wq); + } + + int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt) +diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c +index 9999c8c40269d..e6705a30f3799 100644 +--- a/drivers/net/wireless/ath/ath10k/txrx.c ++++ b/drivers/net/wireless/ath/ath10k/txrx.c +@@ -90,8 +90,6 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, + + ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id); + ath10k_htt_tx_dec_pending(htt); +- if (htt->num_pending_tx == 0) +- wake_up(&htt->empty_tx_wq); + spin_unlock_bh(&htt->tx_lock); + + dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); +-- +2.34.1 + diff --git a/queue-4.14/ath9k-fix-out-of-bound-memcpy-in-ath9k_hif_usb_rx_st.patch b/queue-4.14/ath9k-fix-out-of-bound-memcpy-in-ath9k_hif_usb_rx_st.patch new file mode 100644 index 00000000000..3bb13ca8d96 --- /dev/null +++ b/queue-4.14/ath9k-fix-out-of-bound-memcpy-in-ath9k_hif_usb_rx_st.patch @@ -0,0 +1,90 @@ +From 057c7d607c063140356c6a0f5ba9360244dc1306 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Oct 2021 18:21:42 -0400 +Subject: ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream + +From: Zekun Shen + +[ Upstream commit 6ce708f54cc8d73beca213cec66ede5ce100a781 ] + +Large pkt_len can lead to out-out-bound memcpy. Current +ath9k_hif_usb_rx_stream allows combining the content of two urb +inputs to one pkt. The first input can indicate the size of the +pkt. Any remaining size is saved in hif_dev->rx_remain_len. +While processing the next input, memcpy is used with rx_remain_len. + +4-byte pkt_len can go up to 0xffff, while a single input is 0x4000 +maximum in size (MAX_RX_BUF_SIZE). Thus, the patch adds a check for +pkt_len which must not exceed 2 * MAX_RX_BUG_SIZE. + +BUG: KASAN: slab-out-of-bounds in ath9k_hif_usb_rx_cb+0x490/0xed7 [ath9k_htc] +Read of size 46393 at addr ffff888018798000 by task kworker/0:1/23 + +CPU: 0 PID: 23 Comm: kworker/0:1 Not tainted 5.6.0 #63 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), +BIOS rel-1.10.2-0-g5f4c7b1-prebuilt.qemu-project.org 04/01/2014 +Workqueue: events request_firmware_work_func +Call Trace: + + dump_stack+0x76/0xa0 + print_address_description.constprop.0+0x16/0x200 + ? ath9k_hif_usb_rx_cb+0x490/0xed7 [ath9k_htc] + ? ath9k_hif_usb_rx_cb+0x490/0xed7 [ath9k_htc] + __kasan_report.cold+0x37/0x7c + ? ath9k_hif_usb_rx_cb+0x490/0xed7 [ath9k_htc] + kasan_report+0xe/0x20 + check_memory_region+0x15a/0x1d0 + memcpy+0x20/0x50 + ath9k_hif_usb_rx_cb+0x490/0xed7 [ath9k_htc] + ? hif_usb_mgmt_cb+0x2d9/0x2d9 [ath9k_htc] + ? _raw_spin_lock_irqsave+0x7b/0xd0 + ? _raw_spin_trylock_bh+0x120/0x120 + ? __usb_unanchor_urb+0x12f/0x210 + __usb_hcd_giveback_urb+0x1e4/0x380 + usb_giveback_urb_bh+0x241/0x4f0 + ? __hrtimer_run_queues+0x316/0x740 + ? __usb_hcd_giveback_urb+0x380/0x380 + tasklet_action_common.isra.0+0x135/0x330 + __do_softirq+0x18c/0x634 + irq_exit+0x114/0x140 + smp_apic_timer_interrupt+0xde/0x380 + apic_timer_interrupt+0xf/0x20 + +I found the bug using a custome USBFuzz port. It's a research work +to fuzz USB stack/drivers. I modified it to fuzz ath9k driver only, +providing hand-crafted usb descriptors to QEMU. + +After fixing the value of pkt_tag to ATH_USB_RX_STREAM_MODE_TAG in QEMU +emulation, I found the KASAN report. The bug is triggerable whenever +pkt_len is above two MAX_RX_BUG_SIZE. I used the same input that crashes +to test the driver works when applying the patch. + +Signed-off-by: Zekun Shen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/YXsidrRuK6zBJicZ@10-18-43-117.dynapool.wireless.nyu.edu +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/hif_usb.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c +index ce3a785212740..8125f17526519 100644 +--- a/drivers/net/wireless/ath/ath9k/hif_usb.c ++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c +@@ -588,6 +588,13 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, + return; + } + ++ if (pkt_len > 2 * MAX_RX_BUF_SIZE) { ++ dev_err(&hif_dev->udev->dev, ++ "ath9k_htc: invalid pkt_len (%x)\n", pkt_len); ++ RX_STAT_INC(skb_dropped); ++ return; ++ } ++ + pad_len = 4 - (pkt_len & 0x3); + if (pad_len == 4) + pad_len = 0; +-- +2.34.1 + diff --git a/queue-4.14/bluetooth-cmtp-fix-possible-panic-when-cmtp_init_soc.patch b/queue-4.14/bluetooth-cmtp-fix-possible-panic-when-cmtp_init_soc.patch new file mode 100644 index 00000000000..6205fdc95a3 --- /dev/null +++ b/queue-4.14/bluetooth-cmtp-fix-possible-panic-when-cmtp_init_soc.patch @@ -0,0 +1,54 @@ +From 29eb5a4a5db2c87a34968a7460d47f04712b7eff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Oct 2021 21:10:12 +0800 +Subject: Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails + +From: Wang Hai + +[ Upstream commit 2a7ca7459d905febf519163bd9e3eed894de6bb7 ] + +I got a kernel BUG report when doing fault injection test: + +------------[ cut here ]------------ +kernel BUG at lib/list_debug.c:45! +... +RIP: 0010:__list_del_entry_valid.cold+0x12/0x4d +... +Call Trace: + proto_unregister+0x83/0x220 + cmtp_cleanup_sockets+0x37/0x40 [cmtp] + cmtp_exit+0xe/0x1f [cmtp] + do_syscall_64+0x35/0xb0 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +If cmtp_init_sockets() in cmtp_init() fails, cmtp_init() still returns +success. This will cause a kernel bug when accessing uncreated ctmp +related data when the module exits. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/cmtp/core.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c +index 9873684a9d8ff..4764ed73f33bf 100644 +--- a/net/bluetooth/cmtp/core.c ++++ b/net/bluetooth/cmtp/core.c +@@ -499,9 +499,7 @@ static int __init cmtp_init(void) + { + BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION); + +- cmtp_init_sockets(); +- +- return 0; ++ return cmtp_init_sockets(); + } + + static void __exit cmtp_exit(void) +-- +2.34.1 + diff --git a/queue-4.14/bluetooth-fix-debugfs-entry-leak-in-hci_register_dev.patch b/queue-4.14/bluetooth-fix-debugfs-entry-leak-in-hci_register_dev.patch new file mode 100644 index 00000000000..19451a426ae --- /dev/null +++ b/queue-4.14/bluetooth-fix-debugfs-entry-leak-in-hci_register_dev.patch @@ -0,0 +1,40 @@ +From ae4e09a41251757774c103bdbc62890beb416505 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Oct 2021 16:55:46 +0800 +Subject: Bluetooth: Fix debugfs entry leak in hci_register_dev() + +From: Wei Yongjun + +[ Upstream commit 5a4bb6a8e981d3d0d492aa38412ee80b21033177 ] + +Fault injection test report debugfs entry leak as follows: + +debugfs: Directory 'hci0' with parent 'bluetooth' already present! + +When register_pm_notifier() failed in hci_register_dev(), the debugfs +create by debugfs_create_dir() do not removed in the error handing path. + +Add the remove debugfs code to fix it. + +Signed-off-by: Wei Yongjun +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c +index 1906adfd553ad..687b4d0e4c673 100644 +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -3183,6 +3183,7 @@ int hci_register_dev(struct hci_dev *hdev) + return id; + + err_wqueue: ++ debugfs_remove_recursive(hdev->debugfs); + destroy_workqueue(hdev->workqueue); + destroy_workqueue(hdev->req_workqueue); + err: +-- +2.34.1 + diff --git a/queue-4.14/bluetooth-stop-proccessing-malicious-adv-data.patch b/queue-4.14/bluetooth-stop-proccessing-malicious-adv-data.patch new file mode 100644 index 00000000000..f550e9fdf94 --- /dev/null +++ b/queue-4.14/bluetooth-stop-proccessing-malicious-adv-data.patch @@ -0,0 +1,54 @@ +From 6012c0038042652df05638cc8e63549b09000542 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Nov 2021 10:12:12 +0300 +Subject: Bluetooth: stop proccessing malicious adv data + +From: Pavel Skripkin + +[ Upstream commit 3a56ef719f0b9682afb8a86d64b2399e36faa4e6 ] + +Syzbot reported slab-out-of-bounds read in hci_le_adv_report_evt(). The +problem was in missing validaion check. + +We should check if data is not malicious and we can read next data block. +If we won't check ptr validness, code can read a way beyond skb->end and +it can cause problems, of course. + +Fixes: e95beb414168 ("Bluetooth: hci_le_adv_report_evt code refactoring") +Reported-and-tested-by: syzbot+e3fcb9c4f3c2a931dc40@syzkaller.appspotmail.com +Signed-off-by: Pavel Skripkin +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_event.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 5186f199d892c..eca596a56f46b 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -4967,7 +4967,8 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) + struct hci_ev_le_advertising_info *ev = ptr; + s8 rssi; + +- if (ev->length <= HCI_MAX_AD_LENGTH) { ++ if (ev->length <= HCI_MAX_AD_LENGTH && ++ ev->data + ev->length <= skb_tail_pointer(skb)) { + rssi = ev->data[ev->length]; + process_adv_report(hdev, ev->evt_type, &ev->bdaddr, + ev->bdaddr_type, NULL, 0, rssi, +@@ -4977,6 +4978,11 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) + } + + ptr += sizeof(*ev) + ev->length + 1; ++ ++ if (ptr > (void *) skb_tail_pointer(skb) - sizeof(*ev)) { ++ bt_dev_err(hdev, "Malicious advertising data. Stopping processing"); ++ break; ++ } + } + + hci_dev_unlock(hdev); +-- +2.34.1 + diff --git a/queue-4.14/bpf-do-not-warn-in-bpf_warn_invalid_xdp_action.patch b/queue-4.14/bpf-do-not-warn-in-bpf_warn_invalid_xdp_action.patch new file mode 100644 index 00000000000..f44c724d053 --- /dev/null +++ b/queue-4.14/bpf-do-not-warn-in-bpf_warn_invalid_xdp_action.patch @@ -0,0 +1,51 @@ +From 36c3e15bcc672dc47de9ea13c4f7e9eaadb7a262 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Nov 2021 11:08:06 +0100 +Subject: bpf: Do not WARN in bpf_warn_invalid_xdp_action() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Paolo Abeni + +[ Upstream commit 2cbad989033bff0256675c38f96f5faab852af4b ] + +The WARN_ONCE() in bpf_warn_invalid_xdp_action() can be triggered by +any bugged program, and even attaching a correct program to a NIC +not supporting the given action. + +The resulting splat, beyond polluting the logs, fouls automated tools: +e.g. a syzkaller reproducers using an XDP program returning an +unsupported action will never pass validation. + +Replace the WARN_ONCE with a less intrusive pr_warn_once(). + +Signed-off-by: Paolo Abeni +Signed-off-by: Daniel Borkmann +Acked-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/bpf/016ceec56e4817ebb2a9e35ce794d5c917df572c.1638189075.git.pabeni@redhat.com +Signed-off-by: Sasha Levin +--- + net/core/filter.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/net/core/filter.c b/net/core/filter.c +index 40b378bed6033..729e302bba6e9 100644 +--- a/net/core/filter.c ++++ b/net/core/filter.c +@@ -3644,9 +3644,9 @@ void bpf_warn_invalid_xdp_action(u32 act) + { + const u32 act_max = XDP_REDIRECT; + +- WARN_ONCE(1, "%s XDP return value %u, expect packet loss!\n", +- act > act_max ? "Illegal" : "Driver unsupported", +- act); ++ pr_warn_once("%s XDP return value %u, expect packet loss!\n", ++ act > act_max ? "Illegal" : "Driver unsupported", ++ act); + } + EXPORT_SYMBOL_GPL(bpf_warn_invalid_xdp_action); + +-- +2.34.1 + diff --git a/queue-4.14/btrfs-remove-bug_on-eie-in-find_parent_nodes.patch b/queue-4.14/btrfs-remove-bug_on-eie-in-find_parent_nodes.patch new file mode 100644 index 00000000000..14aa90b740e --- /dev/null +++ b/queue-4.14/btrfs-remove-bug_on-eie-in-find_parent_nodes.patch @@ -0,0 +1,54 @@ +From 64fab41a86640da6aab5e256f3bc320cd2b02201 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 16:45:35 -0400 +Subject: btrfs: remove BUG_ON(!eie) in find_parent_nodes + +From: Josef Bacik + +[ Upstream commit 9f05c09d6baef789726346397438cca4ec43c3ee ] + +If we're looking for leafs that point to a data extent we want to record +the extent items that point at our bytenr. At this point we have the +reference and we know for a fact that this leaf should have a reference +to our bytenr. However if there's some sort of corruption we may not +find any references to our leaf, and thus could end up with eie == NULL. +Replace this BUG_ON() with an ASSERT() and then return -EUCLEAN for the +mortals. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/backref.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c +index f2c2ac3343bac..58dc96d7ecafa 100644 +--- a/fs/btrfs/backref.c ++++ b/fs/btrfs/backref.c +@@ -1315,10 +1315,18 @@ again: + goto out; + if (!ret && extent_item_pos) { + /* +- * we've recorded that parent, so we must extend +- * its inode list here ++ * We've recorded that parent, so we must extend ++ * its inode list here. ++ * ++ * However if there was corruption we may not ++ * have found an eie, return an error in this ++ * case. + */ +- BUG_ON(!eie); ++ ASSERT(eie); ++ if (!eie) { ++ ret = -EUCLEAN; ++ goto out; ++ } + while (eie->next) + eie = eie->next; + eie->next = ref->inode_list; +-- +2.34.1 + diff --git a/queue-4.14/btrfs-remove-bug_on-in-find_parent_nodes.patch b/queue-4.14/btrfs-remove-bug_on-in-find_parent_nodes.patch new file mode 100644 index 00000000000..07b854721b4 --- /dev/null +++ b/queue-4.14/btrfs-remove-bug_on-in-find_parent_nodes.patch @@ -0,0 +1,42 @@ +From 1c4a5bac905c26a22f388c9408364149d6220671 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 16:45:34 -0400 +Subject: btrfs: remove BUG_ON() in find_parent_nodes() + +From: Josef Bacik + +[ Upstream commit fcba0120edf88328524a4878d1d6f4ad39f2ec81 ] + +We search for an extent entry with .offset = -1, which shouldn't be a +thing, but corruption happens. Add an ASSERT() for the developers, +return -EUCLEAN for mortals. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/backref.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c +index 1cf75d1032e17..f2c2ac3343bac 100644 +--- a/fs/btrfs/backref.c ++++ b/fs/btrfs/backref.c +@@ -1163,7 +1163,12 @@ again: + ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0); + if (ret < 0) + goto out; +- BUG_ON(ret == 0); ++ if (ret == 0) { ++ /* This shouldn't happen, indicates a bug or fs corruption. */ ++ ASSERT(ret != 0); ++ ret = -EUCLEAN; ++ goto out; ++ } + + #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS + if (trans && likely(trans->type != __TRANS_DUMMY) && +-- +2.34.1 + diff --git a/queue-4.14/can-softing-softing_startstop-fix-set-but-not-used-v.patch b/queue-4.14/can-softing-softing_startstop-fix-set-but-not-used-v.patch new file mode 100644 index 00000000000..34a4876bbf7 --- /dev/null +++ b/queue-4.14/can-softing-softing_startstop-fix-set-but-not-used-v.patch @@ -0,0 +1,63 @@ +From a9562a79fc67dea7ef8b6aca385928b869d85a55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 Jan 2022 21:57:51 +0100 +Subject: can: softing: softing_startstop(): fix set but not used variable + warning + +From: Marc Kleine-Budde + +[ Upstream commit 370d988cc529598ebaec6487d4f84c2115dc696b ] + +In the function softing_startstop() the variable error_reporting is +assigned but not used. The code that uses this variable is commented +out. Its stated that the functionality is not finally verified. + +To fix the warning: + +| drivers/net/can/softing/softing_fw.c:424:9: error: variable 'error_reporting' set but not used [-Werror,-Wunused-but-set-variable] + +remove the comment, activate the code, but add a "0 &&" to the if +expression and rely on the optimizer rather than the preprocessor to +remove the code. + +Link: https://lore.kernel.org/all/20220109103126.1872833-1-mkl@pengutronix.de +Fixes: 03fd3cf5a179 ("can: add driver for Softing card") +Cc: Kurt Van Dijck +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + drivers/net/can/softing/softing_fw.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c +index aac58ce6e371a..209eddeb822e5 100644 +--- a/drivers/net/can/softing/softing_fw.c ++++ b/drivers/net/can/softing/softing_fw.c +@@ -576,18 +576,19 @@ int softing_startstop(struct net_device *dev, int up) + if (ret < 0) + goto failed; + } +- /* enable_error_frame */ +- /* ++ ++ /* enable_error_frame ++ * + * Error reporting is switched off at the moment since + * the receiving of them is not yet 100% verified + * This should be enabled sooner or later +- * +- if (error_reporting) { ++ */ ++ if (0 && error_reporting) { + ret = softing_fct_cmd(card, 51, "enable_error_frame"); + if (ret < 0) + goto failed; + } +- */ ++ + /* initialize interface */ + iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]); + iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]); +-- +2.34.1 + diff --git a/queue-4.14/can-xilinx_can-xcan_probe-check-for-error-irq.patch b/queue-4.14/can-xilinx_can-xcan_probe-check-for-error-irq.patch new file mode 100644 index 00000000000..e69dbd7a7a3 --- /dev/null +++ b/queue-4.14/can-xilinx_can-xcan_probe-check-for-error-irq.patch @@ -0,0 +1,48 @@ +From 3c62ae268639c1bf45a643ca4ac612e002abae4d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Dec 2021 10:13:24 +0800 +Subject: can: xilinx_can: xcan_probe(): check for error irq + +From: Jiasheng Jiang + +[ Upstream commit c6564c13dae25cd7f8e1de5127b4da4500ee5844 ] + +For the possible failure of the platform_get_irq(), the returned irq +could be error number and will finally cause the failure of the +request_irq(). + +Consider that platform_get_irq() can now in certain cases return +-EPROBE_DEFER, and the consequences of letting request_irq() +effectively convert that into -EINVAL, even at probe time rather than +later on. So it might be better to check just now. + +Fixes: b1201e44f50b ("can: xilinx CAN controller support") +Link: https://lore.kernel.org/all/20211224021324.1447494-1-jiasheng@iscas.ac.cn +Signed-off-by: Jiasheng Jiang +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + drivers/net/can/xilinx_can.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c +index 5a24039733efd..caab0df7b368f 100644 +--- a/drivers/net/can/xilinx_can.c ++++ b/drivers/net/can/xilinx_can.c +@@ -1302,7 +1302,12 @@ static int xcan_probe(struct platform_device *pdev) + spin_lock_init(&priv->tx_lock); + + /* Get IRQ for the device */ +- ndev->irq = platform_get_irq(pdev, 0); ++ ret = platform_get_irq(pdev, 0); ++ if (ret < 0) ++ goto err_free; ++ ++ ndev->irq = ret; ++ + ndev->flags |= IFF_ECHO; /* We support local echo */ + + platform_set_drvdata(pdev, ndev); +-- +2.34.1 + diff --git a/queue-4.14/char-mwave-adjust-io-port-register-size.patch b/queue-4.14/char-mwave-adjust-io-port-register-size.patch new file mode 100644 index 00000000000..719a7be873c --- /dev/null +++ b/queue-4.14/char-mwave-adjust-io-port-register-size.patch @@ -0,0 +1,51 @@ +From 211523ee7e6ec0c26a100f7663bbec16d8edd81d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 00:42:06 -0800 +Subject: char/mwave: Adjust io port register size + +From: Kees Cook + +[ Upstream commit f5912cc19acd7c24b2dbf65a6340bf194244f085 ] + +Using MKWORD() on a byte-sized variable results in OOB read. Expand the +size of the reserved area so both MKWORD and MKBYTE continue to work +without overflow. Silences this warning on a -Warray-bounds build: + +drivers/char/mwave/3780i.h:346:22: error: array subscript 'short unsigned int[0]' is partly outside array bounds of 'DSP_ISA_SLAVE_CONTROL[1]' [-Werror=array-bounds] + 346 | #define MKWORD(var) (*((unsigned short *)(&var))) + | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +drivers/char/mwave/3780i.h:356:40: note: in definition of macro 'OutWordDsp' + 356 | #define OutWordDsp(index,value) outw(value,usDspBaseIO+index) + | ^~~~~ +drivers/char/mwave/3780i.c:373:41: note: in expansion of macro 'MKWORD' + 373 | OutWordDsp(DSP_IsaSlaveControl, MKWORD(rSlaveControl)); + | ^~~~~~ +drivers/char/mwave/3780i.c:358:31: note: while referencing 'rSlaveControl' + 358 | DSP_ISA_SLAVE_CONTROL rSlaveControl; + | ^~~~~~~~~~~~~ + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20211203084206.3104326-1-keescook@chromium.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/char/mwave/3780i.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/char/mwave/3780i.h b/drivers/char/mwave/3780i.h +index 9ccb6b270b071..95164246afd1a 100644 +--- a/drivers/char/mwave/3780i.h ++++ b/drivers/char/mwave/3780i.h +@@ -68,7 +68,7 @@ typedef struct { + unsigned char ClockControl:1; /* RW: Clock control: 0=normal, 1=stop 3780i clocks */ + unsigned char SoftReset:1; /* RW: Soft reset 0=normal, 1=soft reset active */ + unsigned char ConfigMode:1; /* RW: Configuration mode, 0=normal, 1=config mode */ +- unsigned char Reserved:5; /* 0: Reserved */ ++ unsigned short Reserved:13; /* 0: Reserved */ + } DSP_ISA_SLAVE_CONTROL; + + +-- +2.34.1 + diff --git a/queue-4.14/clk-bcm-2835-pick-the-closest-clock-rate.patch b/queue-4.14/clk-bcm-2835-pick-the-closest-clock-rate.patch new file mode 100644 index 00000000000..abb59b5b303 --- /dev/null +++ b/queue-4.14/clk-bcm-2835-pick-the-closest-clock-rate.patch @@ -0,0 +1,46 @@ +From 23fd4abf877c2d13532fcadd482ea4d3251710a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Sep 2021 14:54:15 +0200 +Subject: clk: bcm-2835: Pick the closest clock rate + +From: Maxime Ripard + +[ Upstream commit 5517357a4733d7cf7c17fc79d0530cfa47add372 ] + +The driver currently tries to pick the closest rate that is lower than +the rate being requested. + +This causes an issue with clk_set_min_rate() since it actively checks +for the rounded rate to be above the minimum that was just set. + +Let's change the logic a bit to pick the closest rate to the requested +rate, no matter if it's actually higher or lower. + +Fixes: 6d18b8adbe67 ("clk: bcm2835: Support for clock parent selection") +Signed-off-by: Maxime Ripard +Acked-by: Stephen Boyd +Reviewed-by: Nicolas Saenz Julienne +Tested-by: Nicolas Saenz Julienne # boot and basic functionality +Tested-by: Michael Stapelberg +Link: https://patchwork.freedesktop.org/patch/msgid/20210922125419.4125779-2-maxime@cerno.tech +Signed-off-by: Sasha Levin +--- + drivers/clk/bcm/clk-bcm2835.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c +index 98295b9703178..d6cd1cc3f8e4d 100644 +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -1233,7 +1233,7 @@ static int bcm2835_clock_determine_rate(struct clk_hw *hw, + rate = bcm2835_clock_choose_div_and_prate(hw, i, req->rate, + &div, &prate, + &avgrate); +- if (rate > best_rate && rate <= req->rate) { ++ if (abs(req->rate - rate) < abs(req->rate - best_rate)) { + best_parent = parent; + best_prate = prate; + best_rate = rate; +-- +2.34.1 + diff --git a/queue-4.14/clk-bcm-2835-remove-rounding-up-the-dividers.patch b/queue-4.14/clk-bcm-2835-remove-rounding-up-the-dividers.patch new file mode 100644 index 00000000000..d551cee3619 --- /dev/null +++ b/queue-4.14/clk-bcm-2835-remove-rounding-up-the-dividers.patch @@ -0,0 +1,82 @@ +From b377a9e9fb592a27b396d43435bfe1f350b7dbec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Sep 2021 14:54:16 +0200 +Subject: clk: bcm-2835: Remove rounding up the dividers + +From: Maxime Ripard + +[ Upstream commit 8ca011ef4af48a7af7b15afd8a4a44039dd04cea ] + +The driver, once it found a divider, tries to round it up by increasing +the least significant bit of the fractional part by one when the +round_up argument is set and there's a remainder. + +However, since it increases the divider it will actually reduce the +clock rate below what we were asking for, leading to issues with +clk_set_min_rate() that will complain that our rounded clock rate is +below the minimum of the rate. + +Since the dividers are fairly precise already, let's remove that part so +that we can have clk_set_min_rate() working. + +This is effectively a revert of 9c95b32ca093 ("clk: bcm2835: add a round +up ability to the clock divisor"). + +Fixes: 9c95b32ca093 ("clk: bcm2835: add a round up ability to the clock divisor") +Signed-off-by: Maxime Ripard +Acked-by: Stephen Boyd +Reviewed-by: Nicolas Saenz Julienne +Tested-by: Nicolas Saenz Julienne # boot and basic functionality +Tested-by: Michael Stapelberg +Link: https://patchwork.freedesktop.org/patch/msgid/20210922125419.4125779-3-maxime@cerno.tech +Signed-off-by: Sasha Levin +--- + drivers/clk/bcm/clk-bcm2835.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c +index d6cd1cc3f8e4d..8ccd72cc66bab 100644 +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -949,8 +949,7 @@ static int bcm2835_clock_is_on(struct clk_hw *hw) + + static u32 bcm2835_clock_choose_div(struct clk_hw *hw, + unsigned long rate, +- unsigned long parent_rate, +- bool round_up) ++ unsigned long parent_rate) + { + struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); + const struct bcm2835_clock_data *data = clock->data; +@@ -962,10 +961,6 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw, + + rem = do_div(temp, rate); + div = temp; +- +- /* Round up and mask off the unused bits */ +- if (round_up && ((div & unused_frac_mask) != 0 || rem != 0)) +- div += unused_frac_mask + 1; + div &= ~unused_frac_mask; + + /* different clamping limits apply for a mash clock */ +@@ -1096,7 +1091,7 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw, + struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); + struct bcm2835_cprman *cprman = clock->cprman; + const struct bcm2835_clock_data *data = clock->data; +- u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate, false); ++ u32 div = bcm2835_clock_choose_div(hw, rate, parent_rate); + u32 ctl; + + spin_lock(&cprman->regs_lock); +@@ -1147,7 +1142,7 @@ static unsigned long bcm2835_clock_choose_div_and_prate(struct clk_hw *hw, + + if (!(BIT(parent_idx) & data->set_rate_parent)) { + *prate = clk_hw_get_rate(parent); +- *div = bcm2835_clock_choose_div(hw, rate, *prate, true); ++ *div = bcm2835_clock_choose_div(hw, rate, *prate); + + *avgrate = bcm2835_clock_rate_from_divisor(clock, *prate, *div); + +-- +2.34.1 + diff --git a/queue-4.14/crypto-qce-fix-uaf-on-qce_ahash_register_one.patch b/queue-4.14/crypto-qce-fix-uaf-on-qce_ahash_register_one.patch new file mode 100644 index 00000000000..9efda00c612 --- /dev/null +++ b/queue-4.14/crypto-qce-fix-uaf-on-qce_ahash_register_one.patch @@ -0,0 +1,39 @@ +From a0cf1eb921b652195e03ef4040d96a8e3c584cda Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Nov 2021 06:38:31 -0700 +Subject: crypto: qce - fix uaf on qce_ahash_register_one + +From: Chengfeng Ye + +[ Upstream commit b4cb4d31631912842eb7dce02b4350cbb7562d5e ] + +Pointer base points to sub field of tmpl, it +is dereferenced after tmpl is freed. Fix +this by accessing base before free tmpl. + +Fixes: ec8f5d8f ("crypto: qce - Qualcomm crypto engine driver") +Signed-off-by: Chengfeng Ye +Acked-by: Thara Gopinath +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/qce/sha.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c +index 47e114ac09d01..ff1e788f92767 100644 +--- a/drivers/crypto/qce/sha.c ++++ b/drivers/crypto/qce/sha.c +@@ -544,8 +544,8 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def, + + ret = crypto_register_ahash(alg); + if (ret) { +- kfree(tmpl); + dev_err(qce->dev, "%s registration failed\n", base->cra_name); ++ kfree(tmpl); + return ret; + } + +-- +2.34.1 + diff --git a/queue-4.14/dm-btree-add-a-defensive-bounds-check-to-insert_at.patch b/queue-4.14/dm-btree-add-a-defensive-bounds-check-to-insert_at.patch new file mode 100644 index 00000000000..a251ef982ef --- /dev/null +++ b/queue-4.14/dm-btree-add-a-defensive-bounds-check-to-insert_at.patch @@ -0,0 +1,45 @@ +From 3bfc7cd96377fc1b474bb75d3522fc71637408e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 13:44:13 +0000 +Subject: dm btree: add a defensive bounds check to insert_at() + +From: Joe Thornber + +[ Upstream commit 85bca3c05b6cca31625437eedf2060e846c4bbad ] + +Corrupt metadata could trigger an out of bounds write. + +Signed-off-by: Joe Thornber +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + drivers/md/persistent-data/dm-btree.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c +index 8aae0624a2971..6383afb88f319 100644 +--- a/drivers/md/persistent-data/dm-btree.c ++++ b/drivers/md/persistent-data/dm-btree.c +@@ -83,14 +83,16 @@ void inc_children(struct dm_transaction_manager *tm, struct btree_node *n, + } + + static int insert_at(size_t value_size, struct btree_node *node, unsigned index, +- uint64_t key, void *value) +- __dm_written_to_disk(value) ++ uint64_t key, void *value) ++ __dm_written_to_disk(value) + { + uint32_t nr_entries = le32_to_cpu(node->header.nr_entries); ++ uint32_t max_entries = le32_to_cpu(node->header.max_entries); + __le64 key_le = cpu_to_le64(key); + + if (index > nr_entries || +- index >= le32_to_cpu(node->header.max_entries)) { ++ index >= max_entries || ++ nr_entries >= max_entries) { + DMERR("too many entries in btree node for insert"); + __dm_unbless_for_disk(value); + return -ENOMEM; +-- +2.34.1 + diff --git a/queue-4.14/dm-space-map-common-add-bounds-check-to-sm_ll_lookup.patch b/queue-4.14/dm-space-map-common-add-bounds-check-to-sm_ll_lookup.patch new file mode 100644 index 00000000000..745f0fd2ac8 --- /dev/null +++ b/queue-4.14/dm-space-map-common-add-bounds-check-to-sm_ll_lookup.patch @@ -0,0 +1,37 @@ +From ad7017199a8af35b4f03be20edd6c1d4df6b6971 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 13:49:53 +0000 +Subject: dm space map common: add bounds check to sm_ll_lookup_bitmap() + +From: Joe Thornber + +[ Upstream commit cba23ac158db7f3cd48a923d6861bee2eb7a2978 ] + +Corrupted metadata could warrant returning error from sm_ll_lookup_bitmap(). + +Signed-off-by: Joe Thornber +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + drivers/md/persistent-data/dm-space-map-common.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/md/persistent-data/dm-space-map-common.c b/drivers/md/persistent-data/dm-space-map-common.c +index a2eceb12f01d4..1095b90307aed 100644 +--- a/drivers/md/persistent-data/dm-space-map-common.c ++++ b/drivers/md/persistent-data/dm-space-map-common.c +@@ -279,6 +279,11 @@ int sm_ll_lookup_bitmap(struct ll_disk *ll, dm_block_t b, uint32_t *result) + struct disk_index_entry ie_disk; + struct dm_block *blk; + ++ if (b >= ll->nr_blocks) { ++ DMERR_LIMIT("metadata block out of bounds"); ++ return -EINVAL; ++ } ++ + b = do_div(index, ll->entries_per_block); + r = ll->load_ie(ll, index, &ie_disk); + if (r < 0) +-- +2.34.1 + diff --git a/queue-4.14/dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch b/queue-4.14/dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch new file mode 100644 index 00000000000..fd60b8d6ee2 --- /dev/null +++ b/queue-4.14/dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch @@ -0,0 +1,63 @@ +From b02025960341462ed39a1c0dcdfb00c969cb1aa2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Nov 2021 23:21:58 +0100 +Subject: dmaengine: pxa/mmp: stop referencing config->slave_id + +From: Arnd Bergmann + +[ Upstream commit 134c37fa250a87a7e77c80a7c59ae16c462e46e0 ] + +The last driver referencing the slave_id on Marvell PXA and MMP platforms +was the SPI driver, but this stopped doing so a long time ago, so the +TODO from the earlier patch can no be removed. + +Fixes: b729bf34535e ("spi/pxa2xx: Don't use slave_id of dma_slave_config") +Fixes: 13b3006b8ebd ("dma: mmp_pdma: add filter function") +Signed-off-by: Arnd Bergmann +Acked-by: Mark Brown +Link: https://lore.kernel.org/r/20211122222203.4103644-7-arnd@kernel.org +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/mmp_pdma.c | 6 ------ + drivers/dma/pxa_dma.c | 7 ------- + 2 files changed, 13 deletions(-) + +diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c +index eb3a1f42ab065..e8b2d3e31de80 100644 +--- a/drivers/dma/mmp_pdma.c ++++ b/drivers/dma/mmp_pdma.c +@@ -722,12 +722,6 @@ static int mmp_pdma_config(struct dma_chan *dchan, + + chan->dir = cfg->direction; + chan->dev_addr = addr; +- /* FIXME: drivers should be ported over to use the filter +- * function. Once that's done, the following two lines can +- * be removed. +- */ +- if (cfg->slave_id) +- chan->drcmr = cfg->slave_id; + + return 0; + } +diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c +index b53fb618bbf6b..99a8ff130ad51 100644 +--- a/drivers/dma/pxa_dma.c ++++ b/drivers/dma/pxa_dma.c +@@ -956,13 +956,6 @@ static void pxad_get_config(struct pxad_chan *chan, + *dcmd |= PXA_DCMD_BURST16; + else if (maxburst == 32) + *dcmd |= PXA_DCMD_BURST32; +- +- /* FIXME: drivers should be ported over to use the filter +- * function. Once that's done, the following two lines can +- * be removed. +- */ +- if (chan->cfg.slave_id) +- chan->drcmr = chan->cfg.slave_id; + } + + static struct dma_async_tx_descriptor * +-- +2.34.1 + diff --git a/queue-4.14/drm-amdgpu-fix-a-null-pointer-dereference-in-amdgpu_.patch b/queue-4.14/drm-amdgpu-fix-a-null-pointer-dereference-in-amdgpu_.patch new file mode 100644 index 00000000000..e46737c4927 --- /dev/null +++ b/queue-4.14/drm-amdgpu-fix-a-null-pointer-dereference-in-amdgpu_.patch @@ -0,0 +1,65 @@ +From 723246cadfabfd8949d1ed0e03616a6073b38ad0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 00:17:36 +0800 +Subject: drm/amdgpu: Fix a NULL pointer dereference in + amdgpu_connector_lcd_native_mode() + +From: Zhou Qingyang + +[ Upstream commit b220110e4cd442156f36e1d9b4914bb9e87b0d00 ] + +In amdgpu_connector_lcd_native_mode(), the return value of +drm_mode_duplicate() is assigned to mode, and there is a dereference +of it in amdgpu_connector_lcd_native_mode(), which will lead to a NULL +pointer dereference on failure of drm_mode_duplicate(). + +Fix this bug add a check of mode. + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_DRM_AMDGPU=m show no new warnings, and +our static analyzer no longer warns about this code. + +Fixes: d38ceaf99ed0 ("drm/amdgpu: add core driver (v4)") +Signed-off-by: Zhou Qingyang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +index 54f414279037e..0894bb98dc517 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +@@ -404,6 +404,9 @@ amdgpu_connector_lcd_native_mode(struct drm_encoder *encoder) + native_mode->vdisplay != 0 && + native_mode->clock != 0) { + mode = drm_mode_duplicate(dev, native_mode); ++ if (!mode) ++ return NULL; ++ + mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; + drm_mode_set_name(mode); + +@@ -418,6 +421,9 @@ amdgpu_connector_lcd_native_mode(struct drm_encoder *encoder) + * simpler. + */ + mode = drm_cvt_mode(dev, native_mode->hdisplay, native_mode->vdisplay, 60, true, false, false); ++ if (!mode) ++ return NULL; ++ + mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER; + DRM_DEBUG_KMS("Adding cvt approximation of native panel mode %s\n", mode->name); + } +-- +2.34.1 + diff --git a/queue-4.14/drm-bridge-megachips-ensure-both-bridges-are-probed-.patch b/queue-4.14/drm-bridge-megachips-ensure-both-bridges-are-probed-.patch new file mode 100644 index 00000000000..0f9d10e6b99 --- /dev/null +++ b/queue-4.14/drm-bridge-megachips-ensure-both-bridges-are-probed-.patch @@ -0,0 +1,251 @@ +From 618779ca45cd3680b8d3169d1857c5507b745759 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Nov 2021 10:53:02 +0000 +Subject: drm/bridge: megachips: Ensure both bridges are probed before + registration + +From: Martyn Welch + +[ Upstream commit 11632d4aa2b3f126790e81a4415d6c23103cf8bb ] + +In the configuration used by the b850v3, the STDP2690 is used to read EDID +data whilst it's the STDP4028 which can detect when monitors are connected. + +This can result in problems at boot with monitors connected when the +STDP4028 is probed first, a monitor is detected and an attempt is made to +read the EDID data before the STDP2690 has probed: + +[ 3.795721] Unable to handle kernel NULL pointer dereference at virtual address 00000018 +[ 3.803845] pgd = (ptrval) +[ 3.806581] [00000018] *pgd=00000000 +[ 3.810180] Internal error: Oops: 5 [#1] SMP ARM +[ 3.814813] Modules linked in: +[ 3.817879] CPU: 0 PID: 64 Comm: kworker/u4:1 Not tainted 5.15.0 #1 +[ 3.824161] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) +[ 3.830705] Workqueue: events_unbound deferred_probe_work_func +[ 3.836565] PC is at stdp2690_get_edid+0x44/0x19c +[ 3.841286] LR is at ge_b850v3_lvds_get_modes+0x2c/0x5c +[ 3.846526] pc : [<805eae10>] lr : [<805eb138>] psr: 80000013 +[ 3.852802] sp : 81c359d0 ip : 7dbb550b fp : 81c35a1c +[ 3.858037] r10: 81c73840 r9 : 81c73894 r8 : 816d9800 +[ 3.863270] r7 : 00000000 r6 : 81c34000 r5 : 00000000 r4 : 810c35f0 +[ 3.869808] r3 : 80e3e294 r2 : 00000080 r1 : 00000cc0 r0 : 81401180 +[ 3.876349] Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none +[ 3.883499] Control: 10c5387d Table: 1000404a DAC: 00000051 +[ 3.889254] Register r0 information: slab kmem_cache start 81401180 pointer offset 0 +[ 3.897034] Register r1 information: non-paged memory +[ 3.902097] Register r2 information: non-paged memory +[ 3.907160] Register r3 information: non-slab/vmalloc memory +[ 3.912832] Register r4 information: non-slab/vmalloc memory +[ 3.918503] Register r5 information: NULL pointer +[ 3.923217] Register r6 information: non-slab/vmalloc memory +[ 3.928887] Register r7 information: NULL pointer +[ 3.933601] Register r8 information: slab kmalloc-1k start 816d9800 pointer offset 0 size 1024 +[ 3.942244] Register r9 information: slab kmalloc-2k start 81c73800 pointer offset 148 size 2048 +[ 3.951058] Register r10 information: slab kmalloc-2k start 81c73800 pointer offset 64 size 2048 +[ 3.959873] Register r11 information: non-slab/vmalloc memory +[ 3.965632] Register r12 information: non-paged memory +[ 3.970781] Process kworker/u4:1 (pid: 64, stack limit = 0x(ptrval)) +[ 3.977148] Stack: (0x81c359d0 to 0x81c36000) +[ 3.981517] 59c0: 80b2b668 80b2b5bc 000002e2 0000034e +[ 3.989712] 59e0: 81c35a8c 816d98e8 81c35a14 7dbb550b 805bfcd0 810c35f0 81c73840 824addc0 +[ 3.997906] 5a00: 00001000 816d9800 81c73894 81c73840 81c35a34 81c35a20 805eb138 805eadd8 +[ 4.006099] 5a20: 810c35f0 00000045 81c35adc 81c35a38 80594188 805eb118 80d7c788 80dd1848 +[ 4.014292] 5a40: 00000000 81c35a50 80dca950 811194d3 80dca7c4 80dca944 80dca91c 816d9800 +[ 4.022485] 5a60: 81c34000 81c760a8 816d9800 80c58c98 810c35f0 816d98e8 00001000 00001000 +[ 4.030678] 5a80: 00000000 00000000 8017712c 81c60000 00000002 00000001 00000000 00000000 +[ 4.038870] 5aa0: 816d9900 816d9900 00000000 7dbb550b 805c700c 00000008 826282c8 826282c8 +[ 4.047062] 5ac0: 00001000 81e1ce40 00001000 00000002 81c35bf4 81c35ae0 805d9694 80593fc0 +[ 4.055255] 5ae0: 8017a970 80179ad8 00000179 00000000 81c35bcc 81c35b00 80177108 8017a950 +[ 4.063447] 5b00: 00000000 81c35b10 81c34000 00000000 81004fd8 81010a38 00000000 00000059 +[ 4.071639] 5b20: 816d98d4 81fbb718 00000013 826282c8 8017a940 81c35b40 81134448 00000400 +[ 4.079831] 5b40: 00000178 00000000 e063b9c1 00000000 c2000049 00000040 00000000 00000008 +[ 4.088024] 5b60: 82628300 82628380 00000000 00000000 81c34000 00000000 81fbb700 82628340 +[ 4.096216] 5b80: 826283c0 00001000 00000000 00000010 816d9800 826282c0 801766f8 00000000 +[ 4.104408] 5ba0: 00000000 81004fd8 00000049 00000000 00000000 00000001 80dcf940 80178de4 +[ 4.112601] 5bc0: 81c35c0c 7dbb550b 80178de4 81fbb700 00000010 00000010 810c35f4 81e1ce40 +[ 4.120793] 5be0: 81c40908 0000000c 81c35c64 81c35bf8 805a7f18 805d94a0 81c35c3c 816d9800 +[ 4.128985] 5c00: 00000010 81c34000 81c35c2c 81c35c18 8012fce0 805be90c 81c35c3c 81c35c28 +[ 4.137178] 5c20: 805be90c 80173210 81fbb600 81fbb6b4 81c35c5c 7dbb550b 81c35c64 81fbb700 +[ 4.145370] 5c40: 816d9800 00000010 810c35f4 81e1ce40 81c40908 0000000c 81c35c84 81c35c68 +[ 4.153565] 5c60: 805a8c78 805a7ed0 816d9800 81fbb700 00000010 00000000 81c35cac 81c35c88 +[ 4.161758] 5c80: 805a8dc4 805a8b68 816d9800 00000000 816d9800 00000000 8179f810 810c42d0 +[ 4.169950] 5ca0: 81c35ccc 81c35cb0 805e47b0 805a8d18 824aa240 81e1ea80 81c40908 81126b60 +[ 4.178144] 5cc0: 81c35d14 81c35cd0 8060db1c 805e46cc 81c35d14 81c35ce0 80dd90f8 810c4d58 +[ 4.186338] 5ce0: 80dd90dc 81fe9740 fffffffe 81fe9740 81e1ea80 00000000 810c4d6c 80c4b95c +[ 4.194531] 5d00: 80dd9a3c 815c6810 81c35d34 81c35d18 8060dc9c 8060d8fc 8246b440 815c6800 +[ 4.202724] 5d20: 815c6810 eefd8e00 81c35d44 81c35d38 8060dd80 8060dbec 81c35d6c 81c35d48 +[ 4.210918] 5d40: 805e98a4 8060dd70 00000000 815c6810 810c45b0 81126e90 81126e90 80dd9a3c +[ 4.219112] 5d60: 81c35d8c 81c35d70 80619574 805e9808 815c6810 00000000 810c45b0 81126e90 +[ 4.227305] 5d80: 81c35db4 81c35d90 806168dc 80619514 80625df0 80623c80 815c6810 810c45b0 +[ 4.235498] 5da0: 81c35e6c 815c6810 81c35dec 81c35db8 80616d04 80616800 81c35de4 81c35dc8 +[ 4.243691] 5dc0: 808382b0 80b2f444 8116e310 8116e314 81c35e6c 815c6810 00000003 80dd9a3c +[ 4.251884] 5de0: 81c35e14 81c35df0 80616ec8 80616c60 00000001 810c45b0 81c35e6c 815c6810 +[ 4.260076] 5e00: 00000001 80dd9a3c 81c35e34 81c35e18 80617338 80616e90 00000000 81c35e6c +[ 4.268269] 5e20: 80617284 81c34000 81c35e64 81c35e38 80614730 80617290 81c35e64 8171a06c +[ 4.276461] 5e40: 81e220b8 7dbb550b 815c6810 81c34000 815c6854 81126e90 81c35e9c 81c35e68 +[ 4.284654] 5e60: 8061673c 806146a8 8060f5e0 815c6810 00000001 7dbb550b 00000000 810c5080 +[ 4.292847] 5e80: 810c5320 815c6810 81126e90 00000000 81c35eac 81c35ea0 80617554 80616650 +[ 4.301040] 5ea0: 81c35ecc 81c35eb0 80615694 80617544 810c5080 810c5080 810c5094 81126e90 +[ 4.309233] 5ec0: 81c35efc 81c35ed0 80615c6c 8061560c 80615bc0 810c50c0 817eeb00 81412800 +[ 4.317425] 5ee0: 814c3000 00000000 814c300d 81119a60 81c35f3c 81c35f00 80141488 80615bcc +[ 4.325618] 5f00: 81c60000 81c34000 81c35f24 81c35f18 80143078 817eeb00 81412800 817eeb18 +[ 4.333811] 5f20: 81412818 81003d00 00000088 81412800 81c35f74 81c35f40 80141a48 80141298 +[ 4.342005] 5f40: 81c35f74 81c34000 801481ac 817efa40 817efc00 801417d8 817eeb00 00000000 +[ 4.350199] 5f60: 815a7e7c 81c34000 81c35fac 81c35f78 80149b1c 801417e4 817efc20 817efc20 +[ 4.358391] 5f80: ffffe000 817efa40 801499a8 00000000 00000000 00000000 00000000 00000000 +[ 4.366583] 5fa0: 00000000 81c35fb0 80100130 801499b4 00000000 00000000 00000000 00000000 +[ 4.374774] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +[ 4.382966] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 +[ 4.391155] Backtrace: +[ 4.393613] [<805eadcc>] (stdp2690_get_edid) from [<805eb138>] (ge_b850v3_lvds_get_modes+0x2c/0x5c) +[ 4.402691] r10:81c73840 r9:81c73894 r8:816d9800 r7:00001000 r6:824addc0 r5:81c73840 +[ 4.410534] r4:810c35f0 +[ 4.413073] [<805eb10c>] (ge_b850v3_lvds_get_modes) from [<80594188>] (drm_helper_probe_single_connector_modes+0x1d4/0x84c) +[ 4.424240] r5:00000045 r4:810c35f0 +[ 4.427822] [<80593fb4>] (drm_helper_probe_single_connector_modes) from [<805d9694>] (drm_client_modeset_probe+0x200/0x1384) +[ 4.439074] r10:00000002 r9:00001000 r8:81e1ce40 r7:00001000 r6:826282c8 r5:826282c8 +[ 4.446917] r4:00000008 +[ 4.449455] [<805d9494>] (drm_client_modeset_probe) from [<805a7f18>] (__drm_fb_helper_initial_config_and_unlock+0x54/0x5b4) +[ 4.460713] r10:0000000c r9:81c40908 r8:81e1ce40 r7:810c35f4 r6:00000010 r5:00000010 +[ 4.468556] r4:81fbb700 +[ 4.471095] [<805a7ec4>] (__drm_fb_helper_initial_config_and_unlock) from [<805a8c78>] (drm_fbdev_client_hotplug+0x11c/0x1b0) +[ 4.482434] r10:0000000c r9:81c40908 r8:81e1ce40 r7:810c35f4 r6:00000010 r5:816d9800 +[ 4.490276] r4:81fbb700 +[ 4.492814] [<805a8b5c>] (drm_fbdev_client_hotplug) from [<805a8dc4>] (drm_fbdev_generic_setup+0xb8/0x1a4) +[ 4.502494] r7:00000000 r6:00000010 r5:81fbb700 r4:816d9800 +[ 4.508160] [<805a8d0c>] (drm_fbdev_generic_setup) from [<805e47b0>] (imx_drm_bind+0xf0/0x130) +[ 4.516805] r7:810c42d0 r6:8179f810 r5:00000000 r4:816d9800 +[ 4.522474] [<805e46c0>] (imx_drm_bind) from [<8060db1c>] (try_to_bring_up_master+0x22c/0x2f0) +[ 4.531116] r7:81126b60 r6:81c40908 r5:81e1ea80 r4:824aa240 +[ 4.536783] [<8060d8f0>] (try_to_bring_up_master) from [<8060dc9c>] (__component_add+0xbc/0x184) +[ 4.545597] r10:815c6810 r9:80dd9a3c r8:80c4b95c r7:810c4d6c r6:00000000 r5:81e1ea80 +[ 4.553440] r4:81fe9740 +[ 4.555980] [<8060dbe0>] (__component_add) from [<8060dd80>] (component_add+0x1c/0x20) +[ 4.563921] r7:eefd8e00 r6:815c6810 r5:815c6800 r4:8246b440 +[ 4.569589] [<8060dd64>] (component_add) from [<805e98a4>] (dw_hdmi_imx_probe+0xa8/0xe8) +[ 4.577702] [<805e97fc>] (dw_hdmi_imx_probe) from [<80619574>] (platform_probe+0x6c/0xc8) +[ 4.585908] r9:80dd9a3c r8:81126e90 r7:81126e90 r6:810c45b0 r5:815c6810 r4:00000000 +[ 4.593662] [<80619508>] (platform_probe) from [<806168dc>] (really_probe+0xe8/0x460) +[ 4.601524] r7:81126e90 r6:810c45b0 r5:00000000 r4:815c6810 +[ 4.607191] [<806167f4>] (really_probe) from [<80616d04>] (__driver_probe_device+0xb0/0x230) +[ 4.615658] r7:815c6810 r6:81c35e6c r5:810c45b0 r4:815c6810 +[ 4.621326] [<80616c54>] (__driver_probe_device) from [<80616ec8>] (driver_probe_device+0x44/0xe0) +[ 4.630313] r9:80dd9a3c r8:00000003 r7:815c6810 r6:81c35e6c r5:8116e314 r4:8116e310 +[ 4.638068] [<80616e84>] (driver_probe_device) from [<80617338>] (__device_attach_driver+0xb4/0x12c) +[ 4.647227] r9:80dd9a3c r8:00000001 r7:815c6810 r6:81c35e6c r5:810c45b0 r4:00000001 +[ 4.654981] [<80617284>] (__device_attach_driver) from [<80614730>] (bus_for_each_drv+0x94/0xd8) +[ 4.663794] r7:81c34000 r6:80617284 r5:81c35e6c r4:00000000 +[ 4.669461] [<8061469c>] (bus_for_each_drv) from [<8061673c>] (__device_attach+0xf8/0x190) +[ 4.677753] r7:81126e90 r6:815c6854 r5:81c34000 r4:815c6810 +[ 4.683419] [<80616644>] (__device_attach) from [<80617554>] (device_initial_probe+0x1c/0x20) +[ 4.691971] r8:00000000 r7:81126e90 r6:815c6810 r5:810c5320 r4:810c5080 +[ 4.698681] [<80617538>] (device_initial_probe) from [<80615694>] (bus_probe_device+0x94/0x9c) +[ 4.707318] [<80615600>] (bus_probe_device) from [<80615c6c>] (deferred_probe_work_func+0xac/0xf0) +[ 4.716305] r7:81126e90 r6:810c5094 r5:810c5080 r4:810c5080 +[ 4.721973] [<80615bc0>] (deferred_probe_work_func) from [<80141488>] (process_one_work+0x1fc/0x54c) +[ 4.731139] r10:81119a60 r9:814c300d r8:00000000 r7:814c3000 r6:81412800 r5:817eeb00 +[ 4.738981] r4:810c50c0 r3:80615bc0 +[ 4.742563] [<8014128c>] (process_one_work) from [<80141a48>] (worker_thread+0x270/0x570) +[ 4.750765] r10:81412800 r9:00000088 r8:81003d00 r7:81412818 r6:817eeb18 r5:81412800 +[ 4.758608] r4:817eeb00 +[ 4.761147] [<801417d8>] (worker_thread) from [<80149b1c>] (kthread+0x174/0x190) +[ 4.768574] r10:81c34000 r9:815a7e7c r8:00000000 r7:817eeb00 r6:801417d8 r5:817efc00 +[ 4.776417] r4:817efa40 +[ 4.778955] [<801499a8>] (kthread) from [<80100130>] (ret_from_fork+0x14/0x24) +[ 4.786201] Exception stack(0x81c35fb0 to 0x81c35ff8) +[ 4.791266] 5fa0: 00000000 00000000 00000000 00000000 +[ 4.799459] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 +[ 4.807651] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 +[ 4.814279] r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:801499a8 +[ 4.822120] r4:817efa40 +[ 4.824664] Code: e3a02080 e593001c e3a01d33 e3a05000 (e5979018) + +Split the registration from the STDP4028 probe routine and only perform +registration once both the STDP4028 and STDP2690 have probed. + +Signed-off-by: Martyn Welch +CC: Peter Senna Tschudin +CC: Martyn Welch +CC: Neil Armstrong +CC: Robert Foss +CC: Laurent Pinchart +CC: Jonas Karlman +CC: Jernej Skrabec +Signed-off-by: Robert Foss +Link: https://patchwork.freedesktop.org/patch/msgid/43552c3404e8fdf92d8bc5658fac24e9f03c2c57.1637836606.git.martyn.welch@collabora.com +Signed-off-by: Sasha Levin +--- + .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 40 +++++++++++++------ + 1 file changed, 28 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +index 9f522372a4884..4ab7b034bfec8 100644 +--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c ++++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +@@ -302,19 +302,10 @@ out: + mutex_unlock(&ge_b850v3_lvds_dev_mutex); + } + +-static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, +- const struct i2c_device_id *id) ++static int ge_b850v3_register(void) + { ++ struct i2c_client *stdp4028_i2c = ge_b850v3_lvds_ptr->stdp4028_i2c; + struct device *dev = &stdp4028_i2c->dev; +- int ret; +- +- ret = ge_b850v3_lvds_init(dev); +- +- if (ret) +- return ret; +- +- ge_b850v3_lvds_ptr->stdp4028_i2c = stdp4028_i2c; +- i2c_set_clientdata(stdp4028_i2c, ge_b850v3_lvds_ptr); + + /* drm bridge initialization */ + ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs; +@@ -336,6 +327,27 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, + "ge-b850v3-lvds-dp", ge_b850v3_lvds_ptr); + } + ++static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, ++ const struct i2c_device_id *id) ++{ ++ struct device *dev = &stdp4028_i2c->dev; ++ int ret; ++ ++ ret = ge_b850v3_lvds_init(dev); ++ ++ if (ret) ++ return ret; ++ ++ ge_b850v3_lvds_ptr->stdp4028_i2c = stdp4028_i2c; ++ i2c_set_clientdata(stdp4028_i2c, ge_b850v3_lvds_ptr); ++ ++ /* Only register after both bridges are probed */ ++ if (!ge_b850v3_lvds_ptr->stdp2690_i2c) ++ return 0; ++ ++ return ge_b850v3_register(); ++} ++ + static int stdp4028_ge_b850v3_fw_remove(struct i2c_client *stdp4028_i2c) + { + ge_b850v3_lvds_remove(); +@@ -379,7 +391,11 @@ static int stdp2690_ge_b850v3_fw_probe(struct i2c_client *stdp2690_i2c, + ge_b850v3_lvds_ptr->stdp2690_i2c = stdp2690_i2c; + i2c_set_clientdata(stdp2690_i2c, ge_b850v3_lvds_ptr); + +- return 0; ++ /* Only register after both bridges are probed */ ++ if (!ge_b850v3_lvds_ptr->stdp4028_i2c) ++ return 0; ++ ++ return ge_b850v3_register(); + } + + static int stdp2690_ge_b850v3_fw_remove(struct i2c_client *stdp2690_i2c) +-- +2.34.1 + diff --git a/queue-4.14/drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch b/queue-4.14/drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch new file mode 100644 index 00000000000..0a9d26aa4f3 --- /dev/null +++ b/queue-4.14/drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch @@ -0,0 +1,104 @@ +From 4f108fc910c3b06669c579eea9cde09d85aa4e19 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Feb 2021 19:29:52 +1000 +Subject: drm/nouveau/pmu/gm200-: avoid touching PMU outside of + DEVINIT/PREOS/ACR + +From: Ben Skeggs + +[ Upstream commit 1d2271d2fb85e54bfc9630a6c30ac0feb9ffb983 ] + +There have been reports of the WFI timing out on some boards, and a +patch was proposed to just remove it. This stuff is rather fragile, +and I believe the WFI might be needed with our FW prior to GM200. + +However, we probably should not be touching PMU during init on GPUs +where we depend on NVIDIA FW, outside of limited circumstances, so +this should be a somewhat safer change that achieves the desired +result. + +Reported-by: Diego Viola +Signed-off-by: Ben Skeggs +Reviewed-by: Karol Herbst +Signed-off-by: Karol Herbst +Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/10 +Signed-off-by: Sasha Levin +--- + .../gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 37 +++++++++++-------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +index ce70a193caa7f..8cf3d1b4662de 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c +@@ -70,20 +70,13 @@ nvkm_pmu_fini(struct nvkm_subdev *subdev, bool suspend) + return 0; + } + +-static int ++static void + nvkm_pmu_reset(struct nvkm_pmu *pmu) + { + struct nvkm_device *device = pmu->subdev.device; + + if (!pmu->func->enabled(pmu)) +- return 0; +- +- /* Inhibit interrupts, and wait for idle. */ +- nvkm_wr32(device, 0x10a014, 0x0000ffff); +- nvkm_msec(device, 2000, +- if (!nvkm_rd32(device, 0x10a04c)) +- break; +- ); ++ return; + + /* Reset. */ + if (pmu->func->reset) +@@ -94,25 +87,37 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) + if (!(nvkm_rd32(device, 0x10a10c) & 0x00000006)) + break; + ); +- +- return 0; + } + + static int + nvkm_pmu_preinit(struct nvkm_subdev *subdev) + { + struct nvkm_pmu *pmu = nvkm_pmu(subdev); +- return nvkm_pmu_reset(pmu); ++ nvkm_pmu_reset(pmu); ++ return 0; + } + + static int + nvkm_pmu_init(struct nvkm_subdev *subdev) + { + struct nvkm_pmu *pmu = nvkm_pmu(subdev); +- int ret = nvkm_pmu_reset(pmu); +- if (ret == 0 && pmu->func->init) +- ret = pmu->func->init(pmu); +- return ret; ++ struct nvkm_device *device = pmu->subdev.device; ++ ++ if (!pmu->func->init) ++ return 0; ++ ++ if (pmu->func->enabled(pmu)) { ++ /* Inhibit interrupts, and wait for idle. */ ++ nvkm_wr32(device, 0x10a014, 0x0000ffff); ++ nvkm_msec(device, 2000, ++ if (!nvkm_rd32(device, 0x10a04c)) ++ break; ++ ); ++ ++ nvkm_pmu_reset(pmu); ++ } ++ ++ return pmu->func->init(pmu); + } + + static int +-- +2.34.1 + diff --git a/queue-4.14/drm-radeon-radeon_kms-fix-a-null-pointer-dereference.patch b/queue-4.14/drm-radeon-radeon_kms-fix-a-null-pointer-dereference.patch new file mode 100644 index 00000000000..b25fe17a1fe --- /dev/null +++ b/queue-4.14/drm-radeon-radeon_kms-fix-a-null-pointer-dereference.patch @@ -0,0 +1,122 @@ +From 8e2cd672867193a876d8fdef13237274671e9fff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 23:13:10 +0800 +Subject: drm/radeon/radeon_kms: Fix a NULL pointer dereference in + radeon_driver_open_kms() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Zhou Qingyang + +[ Upstream commit ab50cb9df8896b39aae65c537a30de2c79c19735 ] + +In radeon_driver_open_kms(), radeon_vm_bo_add() is assigned to +vm->ib_bo_va and passes and used in radeon_vm_bo_set_addr(). In +radeon_vm_bo_set_addr(), there is a dereference of vm->ib_bo_va, +which could lead to a NULL pointer dereference on failure of +radeon_vm_bo_add(). + +Fix this bug by adding a check of vm->ib_bo_va. + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_DRM_RADEON=m show no new warnings, +and our static analyzer no longer warns about this code. + +Fixes: cc9e67e3d700 ("drm/radeon: fix VM IB handling") +Reviewed-by: Christian König +Signed-off-by: Zhou Qingyang +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/radeon_kms.c | 36 ++++++++++++++++------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c +index 4973bd241aec3..fb292b9f3d402 100644 +--- a/drivers/gpu/drm/radeon/radeon_kms.c ++++ b/drivers/gpu/drm/radeon/radeon_kms.c +@@ -655,6 +655,8 @@ void radeon_driver_lastclose_kms(struct drm_device *dev) + int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) + { + struct radeon_device *rdev = dev->dev_private; ++ struct radeon_fpriv *fpriv; ++ struct radeon_vm *vm; + int r; + + file_priv->driver_priv = NULL; +@@ -667,8 +669,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) + + /* new gpu have virtual address space support */ + if (rdev->family >= CHIP_CAYMAN) { +- struct radeon_fpriv *fpriv; +- struct radeon_vm *vm; + + fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL); + if (unlikely(!fpriv)) { +@@ -679,35 +679,39 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) + if (rdev->accel_working) { + vm = &fpriv->vm; + r = radeon_vm_init(rdev, vm); +- if (r) { +- kfree(fpriv); +- goto out_suspend; +- } ++ if (r) ++ goto out_fpriv; + + r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false); +- if (r) { +- radeon_vm_fini(rdev, vm); +- kfree(fpriv); +- goto out_suspend; +- } ++ if (r) ++ goto out_vm_fini; + + /* map the ib pool buffer read only into + * virtual address space */ + vm->ib_bo_va = radeon_vm_bo_add(rdev, vm, + rdev->ring_tmp_bo.bo); ++ if (!vm->ib_bo_va) { ++ r = -ENOMEM; ++ goto out_vm_fini; ++ } ++ + r = radeon_vm_bo_set_addr(rdev, vm->ib_bo_va, + RADEON_VA_IB_OFFSET, + RADEON_VM_PAGE_READABLE | + RADEON_VM_PAGE_SNOOPED); +- if (r) { +- radeon_vm_fini(rdev, vm); +- kfree(fpriv); +- goto out_suspend; +- } ++ if (r) ++ goto out_vm_fini; + } + file_priv->driver_priv = fpriv; + } + ++ if (!r) ++ goto out_suspend; ++ ++out_vm_fini: ++ radeon_vm_fini(rdev, vm); ++out_fpriv: ++ kfree(fpriv); + out_suspend: + pm_runtime_mark_last_busy(dev->dev); + pm_runtime_put_autosuspend(dev->dev); +-- +2.34.1 + diff --git a/queue-4.14/ext4-avoid-trim-error-on-fs-with-small-groups.patch b/queue-4.14/ext4-avoid-trim-error-on-fs-with-small-groups.patch new file mode 100644 index 00000000000..ed00cd56805 --- /dev/null +++ b/queue-4.14/ext4-avoid-trim-error-on-fs-with-small-groups.patch @@ -0,0 +1,72 @@ +From 9175ddb2401f7f594a2a00cb1c43451473eec4cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Nov 2021 16:22:02 +0100 +Subject: ext4: avoid trim error on fs with small groups + +From: Jan Kara + +[ Upstream commit 173b6e383d2a204c9921ffc1eca3b87aa2106c33 ] + +A user reported FITRIM ioctl failing for him on ext4 on some devices +without apparent reason. After some debugging we've found out that +these devices (being LVM volumes) report rather large discard +granularity of 42MB and the filesystem had 1k blocksize and thus group +size of 8MB. Because ext4 FITRIM implementation puts discard +granularity into minlen, ext4_trim_fs() declared the trim request as +invalid. However just silently doing nothing seems to be a more +appropriate reaction to such combination of parameters since user did +not specify anything wrong. + +CC: Lukas Czerner +Fixes: 5c2ed62fd447 ("ext4: Adjust minlen with discard_granularity in the FITRIM ioctl") +Signed-off-by: Jan Kara +Link: https://lore.kernel.org/r/20211112152202.26614-1-jack@suse.cz +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/ioctl.c | 2 -- + fs/ext4/mballoc.c | 8 ++++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c +index 6718c7ccd6314..3bd79fc4e9487 100644 +--- a/fs/ext4/ioctl.c ++++ b/fs/ext4/ioctl.c +@@ -992,8 +992,6 @@ resizefs_out: + sizeof(range))) + return -EFAULT; + +- range.minlen = max((unsigned int)range.minlen, +- q->limits.discard_granularity); + ret = ext4_trim_fs(sb, &range); + if (ret < 0) + return ret; +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index c40d3c44a1d69..28bee66c5fbf0 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -5284,6 +5284,7 @@ out: + */ + int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) + { ++ struct request_queue *q = bdev_get_queue(sb->s_bdev); + struct ext4_group_info *grp; + ext4_group_t group, first_group, last_group; + ext4_grpblk_t cnt = 0, first_cluster, last_cluster; +@@ -5302,6 +5303,13 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) + start >= max_blks || + range->len < sb->s_blocksize) + return -EINVAL; ++ /* No point to try to trim less than discard granularity */ ++ if (range->minlen < q->limits.discard_granularity) { ++ minlen = EXT4_NUM_B2C(EXT4_SB(sb), ++ q->limits.discard_granularity >> sb->s_blocksize_bits); ++ if (minlen > EXT4_CLUSTERS_PER_GROUP(sb)) ++ goto out; ++ } + if (end >= max_blks) + end = max_blks - 1; + if (end <= first_data_blk) +-- +2.34.1 + diff --git a/queue-4.14/floppy-add-max-size-check-for-user-space-request.patch b/queue-4.14/floppy-add-max-size-check-for-user-space-request.patch new file mode 100644 index 00000000000..e9f410200f8 --- /dev/null +++ b/queue-4.14/floppy-add-max-size-check-for-user-space-request.patch @@ -0,0 +1,82 @@ +From b56b6c503abb76bc715f9aeb42cacea70210f875 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Nov 2021 21:10:33 +0800 +Subject: floppy: Add max size check for user space request + +From: Xiongwei Song + +[ Upstream commit 545a32498c536ee152331cd2e7d2416aa0f20e01 ] + +We need to check the max request size that is from user space before +allocating pages. If the request size exceeds the limit, return -EINVAL. +This check can avoid the warning below from page allocator. + +WARNING: CPU: 3 PID: 16525 at mm/page_alloc.c:5344 current_gfp_context include/linux/sched/mm.h:195 [inline] +WARNING: CPU: 3 PID: 16525 at mm/page_alloc.c:5344 __alloc_pages+0x45d/0x500 mm/page_alloc.c:5356 +Modules linked in: +CPU: 3 PID: 16525 Comm: syz-executor.3 Not tainted 5.15.0-syzkaller #0 +Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 +RIP: 0010:__alloc_pages+0x45d/0x500 mm/page_alloc.c:5344 +Code: be c9 00 00 00 48 c7 c7 20 4a 97 89 c6 05 62 32 a7 0b 01 e8 74 9a 42 07 e9 6a ff ff ff 0f 0b e9 a0 fd ff ff 40 80 e5 3f eb 88 <0f> 0b e9 18 ff ff ff 4c 89 ef 44 89 e6 45 31 ed e8 1e 76 ff ff e9 +RSP: 0018:ffffc90023b87850 EFLAGS: 00010246 +RAX: 0000000000000000 RBX: 1ffff92004770f0b RCX: dffffc0000000000 +RDX: 0000000000000000 RSI: 0000000000000033 RDI: 0000000000010cc1 +RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000001 +R10: ffffffff81bb4686 R11: 0000000000000001 R12: ffffffff902c1960 +R13: 0000000000000033 R14: 0000000000000000 R15: ffff88804cf64a30 +FS: 0000000000000000(0000) GS:ffff88802cd00000(0063) knlGS:00000000f44b4b40 +CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 +CR2: 000000002c921000 CR3: 000000004f507000 CR4: 0000000000150ee0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +Call Trace: + + alloc_pages+0x1a7/0x300 mm/mempolicy.c:2191 + __get_free_pages+0x8/0x40 mm/page_alloc.c:5418 + raw_cmd_copyin drivers/block/floppy.c:3113 [inline] + raw_cmd_ioctl drivers/block/floppy.c:3160 [inline] + fd_locked_ioctl+0x12e5/0x2820 drivers/block/floppy.c:3528 + fd_ioctl drivers/block/floppy.c:3555 [inline] + fd_compat_ioctl+0x891/0x1b60 drivers/block/floppy.c:3869 + compat_blkdev_ioctl+0x3b8/0x810 block/ioctl.c:662 + __do_compat_sys_ioctl+0x1c7/0x290 fs/ioctl.c:972 + do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] + __do_fast_syscall_32+0x65/0xf0 arch/x86/entry/common.c:178 + do_fast_syscall_32+0x2f/0x70 arch/x86/entry/common.c:203 + entry_SYSENTER_compat_after_hwframe+0x4d/0x5c + +Reported-by: syzbot+23a02c7df2cf2bc93fa2@syzkaller.appspotmail.com +Link: https://lore.kernel.org/r/20211116131033.27685-1-sxwjean@me.com +Signed-off-by: Xiongwei Song +Signed-off-by: Denis Efremov +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/floppy.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c +index b6c99cf1ce745..057bedeaacab5 100644 +--- a/drivers/block/floppy.c ++++ b/drivers/block/floppy.c +@@ -3118,6 +3118,8 @@ static void raw_cmd_free(struct floppy_raw_cmd **ptr) + } + } + ++#define MAX_LEN (1UL << MAX_ORDER << PAGE_SHIFT) ++ + static int raw_cmd_copyin(int cmd, void __user *param, + struct floppy_raw_cmd **rcmd) + { +@@ -3155,7 +3157,7 @@ loop: + ptr->resultcode = 0; + + if (ptr->flags & (FD_RAW_READ | FD_RAW_WRITE)) { +- if (ptr->length <= 0) ++ if (ptr->length <= 0 || ptr->length >= MAX_LEN) + return -EINVAL; + ptr->kernel_data = (char *)fd_dma_mem_alloc(ptr->length); + fallback_on_nodma_alloc(&ptr->kernel_data, ptr->length); +-- +2.34.1 + diff --git a/queue-4.14/floppy-fix-hang-in-watchdog-when-disk-is-ejected.patch b/queue-4.14/floppy-fix-hang-in-watchdog-when-disk-is-ejected.patch new file mode 100644 index 00000000000..5bb4ed0339e --- /dev/null +++ b/queue-4.14/floppy-fix-hang-in-watchdog-when-disk-is-ejected.patch @@ -0,0 +1,52 @@ +From 946a3ef2301536d1d3659a4eca3e98517e091dae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Sep 2021 09:47:58 +0300 +Subject: floppy: Fix hang in watchdog when disk is ejected + +From: Tasos Sahanidis + +[ Upstream commit fb48febce7e30baed94dd791e19521abd2c3fd83 ] + +When the watchdog detects a disk change, it calls cancel_activity(), +which in turn tries to cancel the fd_timer delayed work. + +In the above scenario, fd_timer_fn is set to fd_watchdog(), meaning +it is trying to cancel its own work. +This results in a hang as cancel_delayed_work_sync() is waiting for the +watchdog (itself) to return, which never happens. + +This can be reproduced relatively consistently by attempting to read a +broken floppy, and ejecting it while IO is being attempted and retried. + +To resolve this, this patch calls cancel_delayed_work() instead, which +cancels the work without waiting for the watchdog to return and finish. + +Before this regression was introduced, the code in this section used +del_timer(), and not del_timer_sync() to delete the watchdog timer. + +Link: https://lore.kernel.org/r/399e486c-6540-db27-76aa-7a271b061f76@tasossah.com +Fixes: 070ad7e793dc ("floppy: convert to delayed work and single-thread wq") +Signed-off-by: Tasos Sahanidis +Signed-off-by: Denis Efremov +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/floppy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c +index cbf74731cfce6..b6c99cf1ce745 100644 +--- a/drivers/block/floppy.c ++++ b/drivers/block/floppy.c +@@ -994,7 +994,7 @@ static DECLARE_DELAYED_WORK(fd_timer, fd_timer_workfn); + static void cancel_activity(void) + { + do_floppy = NULL; +- cancel_delayed_work_sync(&fd_timer); ++ cancel_delayed_work(&fd_timer); + cancel_work_sync(&floppy_work); + } + +-- +2.34.1 + diff --git a/queue-4.14/fs-dlm-filter-user-dlm-messages-for-kernel-locks.patch b/queue-4.14/fs-dlm-filter-user-dlm-messages-for-kernel-locks.patch new file mode 100644 index 00000000000..9f828231bfc --- /dev/null +++ b/queue-4.14/fs-dlm-filter-user-dlm-messages-for-kernel-locks.patch @@ -0,0 +1,118 @@ +From 7f3d9da8446b5f41d0c7c49b15cd8b574f0c46cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Nov 2021 15:17:24 -0400 +Subject: fs: dlm: filter user dlm messages for kernel locks + +From: Alexander Aring + +[ Upstream commit 6c2e3bf68f3e5e5a647aa52be246d5f552d7496d ] + +This patch fixes the following crash by receiving a invalid message: + +[ 160.672220] ================================================================== +[ 160.676206] BUG: KASAN: user-memory-access in dlm_user_add_ast+0xc3/0x370 +[ 160.679659] Read of size 8 at addr 00000000deadbeef by task kworker/u32:13/319 +[ 160.681447] +[ 160.681824] CPU: 10 PID: 319 Comm: kworker/u32:13 Not tainted 5.14.0-rc2+ #399 +[ 160.683472] Hardware name: Red Hat KVM/RHEL-AV, BIOS 1.14.0-1.module+el8.6.0+12648+6ede71a5 04/01/2014 +[ 160.685574] Workqueue: dlm_recv process_recv_sockets +[ 160.686721] Call Trace: +[ 160.687310] dump_stack_lvl+0x56/0x6f +[ 160.688169] ? dlm_user_add_ast+0xc3/0x370 +[ 160.689116] kasan_report.cold.14+0x116/0x11b +[ 160.690138] ? dlm_user_add_ast+0xc3/0x370 +[ 160.690832] dlm_user_add_ast+0xc3/0x370 +[ 160.691502] _receive_unlock_reply+0x103/0x170 +[ 160.692241] _receive_message+0x11df/0x1ec0 +[ 160.692926] ? rcu_read_lock_sched_held+0xa1/0xd0 +[ 160.693700] ? rcu_read_lock_bh_held+0xb0/0xb0 +[ 160.694427] ? lock_acquire+0x175/0x400 +[ 160.695058] ? do_purge.isra.51+0x200/0x200 +[ 160.695744] ? lock_acquired+0x360/0x5d0 +[ 160.696400] ? lock_contended+0x6a0/0x6a0 +[ 160.697055] ? lock_release+0x21d/0x5e0 +[ 160.697686] ? lock_is_held_type+0xe0/0x110 +[ 160.698352] ? lock_is_held_type+0xe0/0x110 +[ 160.699026] ? ___might_sleep+0x1cc/0x1e0 +[ 160.699698] ? dlm_wait_requestqueue+0x94/0x140 +[ 160.700451] ? dlm_process_requestqueue+0x240/0x240 +[ 160.701249] ? down_write_killable+0x2b0/0x2b0 +[ 160.701988] ? do_raw_spin_unlock+0xa2/0x130 +[ 160.702690] dlm_receive_buffer+0x1a5/0x210 +[ 160.703385] dlm_process_incoming_buffer+0x726/0x9f0 +[ 160.704210] receive_from_sock+0x1c0/0x3b0 +[ 160.704886] ? dlm_tcp_shutdown+0x30/0x30 +[ 160.705561] ? lock_acquire+0x175/0x400 +[ 160.706197] ? rcu_read_lock_sched_held+0xa1/0xd0 +[ 160.706941] ? rcu_read_lock_bh_held+0xb0/0xb0 +[ 160.707681] process_recv_sockets+0x32/0x40 +[ 160.708366] process_one_work+0x55e/0xad0 +[ 160.709045] ? pwq_dec_nr_in_flight+0x110/0x110 +[ 160.709820] worker_thread+0x65/0x5e0 +[ 160.710423] ? process_one_work+0xad0/0xad0 +[ 160.711087] kthread+0x1ed/0x220 +[ 160.711628] ? set_kthread_struct+0x80/0x80 +[ 160.712314] ret_from_fork+0x22/0x30 + +The issue is that we received a DLM message for a user lock but the +destination lock is a kernel lock. Note that the address which is trying +to derefence is 00000000deadbeef, which is in a kernel lock +lkb->lkb_astparam, this field should never be derefenced by the DLM +kernel stack. In case of a user lock lkb->lkb_astparam is lkb->lkb_ua +(memory is shared by a union field). The struct lkb_ua will be handled +by the DLM kernel stack but on a kernel lock it will contain invalid +data and ends in most likely crashing the kernel. + +It can be reproduced with two cluster nodes. + +node 2: +dlm_tool join test +echo "862 fooobaar 1 2 1" > /sys/kernel/debug/dlm/test_locks +echo "862 3 1" > /sys/kernel/debug/dlm/test_waiters + +node 1: +dlm_tool join test + +python: +foo = DLM(h_cmd=3, o_nextcmd=1, h_nodeid=1, h_lockspace=0x77222027, \ + m_type=7, m_flags=0x1, m_remid=0x862, m_result=0xFFFEFFFE) +newFile = open("/sys/kernel/debug/dlm/comms/2/rawmsg", "wb") +newFile.write(bytes(foo)) + +Signed-off-by: Alexander Aring +Signed-off-by: David Teigland +Signed-off-by: Sasha Levin +--- + fs/dlm/lock.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c +index 21643d2b3fee4..8364f170fbb82 100644 +--- a/fs/dlm/lock.c ++++ b/fs/dlm/lock.c +@@ -3974,6 +3974,14 @@ static int validate_message(struct dlm_lkb *lkb, struct dlm_message *ms) + int from = ms->m_header.h_nodeid; + int error = 0; + ++ /* currently mixing of user/kernel locks are not supported */ ++ if (ms->m_flags & DLM_IFL_USER && ~lkb->lkb_flags & DLM_IFL_USER) { ++ log_error(lkb->lkb_resource->res_ls, ++ "got user dlm message for a kernel lock"); ++ error = -EINVAL; ++ goto out; ++ } ++ + switch (ms->m_type) { + case DLM_MSG_CONVERT: + case DLM_MSG_UNLOCK: +@@ -4002,6 +4010,7 @@ static int validate_message(struct dlm_lkb *lkb, struct dlm_message *ms) + error = -EINVAL; + } + ++out: + if (error) + log_error(lkb->lkb_resource->res_ls, + "ignore invalid message %d from %d %x %x %x %d", +-- +2.34.1 + diff --git a/queue-4.14/fsl-fman-check-for-null-pointer-after-calling-devm_i.patch b/queue-4.14/fsl-fman-check-for-null-pointer-after-calling-devm_i.patch new file mode 100644 index 00000000000..529d1e36670 --- /dev/null +++ b/queue-4.14/fsl-fman-check-for-null-pointer-after-calling-devm_i.patch @@ -0,0 +1,96 @@ +From 651715eb551d52e9a3f2f93fbf566f1c02508fee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Jan 2022 18:04:10 +0800 +Subject: fsl/fman: Check for null pointer after calling devm_ioremap + +From: Jiasheng Jiang + +[ Upstream commit d5a73ec96cc57cf67e51b12820fc2354e7ca46f8 ] + +As the possible failure of the allocation, the devm_ioremap() may return +NULL pointer. +Take tgec_initialization() as an example. +If allocation fails, the params->base_addr will be NULL pointer and will +be assigned to tgec->regs in tgec_config(). +Then it will cause the dereference of NULL pointer in set_mac_address(), +which is called by tgec_init(). +Therefore, it should be better to add the sanity check after the calling +of the devm_ioremap(). + +Fixes: 3933961682a3 ("fsl/fman: Add FMan MAC driver") +Signed-off-by: Jiasheng Jiang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/mac.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c +index 387eb4a88b723..3221a54202638 100644 +--- a/drivers/net/ethernet/freescale/fman/mac.c ++++ b/drivers/net/ethernet/freescale/fman/mac.c +@@ -96,14 +96,17 @@ static void mac_exception(void *handle, enum fman_mac_exceptions ex) + __func__, ex); + } + +-static void set_fman_mac_params(struct mac_device *mac_dev, +- struct fman_mac_params *params) ++static int set_fman_mac_params(struct mac_device *mac_dev, ++ struct fman_mac_params *params) + { + struct mac_priv_s *priv = mac_dev->priv; + + params->base_addr = (typeof(params->base_addr)) + devm_ioremap(priv->dev, mac_dev->res->start, + resource_size(mac_dev->res)); ++ if (!params->base_addr) ++ return -ENOMEM; ++ + memcpy(¶ms->addr, mac_dev->addr, sizeof(mac_dev->addr)); + params->max_speed = priv->max_speed; + params->phy_if = priv->phy_if; +@@ -114,6 +117,8 @@ static void set_fman_mac_params(struct mac_device *mac_dev, + params->event_cb = mac_exception; + params->dev_id = mac_dev; + params->internal_phy_node = priv->internal_phy_node; ++ ++ return 0; + } + + static int tgec_initialization(struct mac_device *mac_dev) +@@ -125,7 +130,9 @@ static int tgec_initialization(struct mac_device *mac_dev) + + priv = mac_dev->priv; + +- set_fman_mac_params(mac_dev, ¶ms); ++ err = set_fman_mac_params(mac_dev, ¶ms); ++ if (err) ++ goto _return; + + mac_dev->fman_mac = tgec_config(¶ms); + if (!mac_dev->fman_mac) { +@@ -171,7 +178,9 @@ static int dtsec_initialization(struct mac_device *mac_dev) + + priv = mac_dev->priv; + +- set_fman_mac_params(mac_dev, ¶ms); ++ err = set_fman_mac_params(mac_dev, ¶ms); ++ if (err) ++ goto _return; + + mac_dev->fman_mac = dtsec_config(¶ms); + if (!mac_dev->fman_mac) { +@@ -220,7 +229,9 @@ static int memac_initialization(struct mac_device *mac_dev) + + priv = mac_dev->priv; + +- set_fman_mac_params(mac_dev, ¶ms); ++ err = set_fman_mac_params(mac_dev, ¶ms); ++ if (err) ++ goto _return; + + if (priv->max_speed == SPEED_10000) + params.phy_if = PHY_INTERFACE_MODE_XGMII; +-- +2.34.1 + diff --git a/queue-4.14/gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch b/queue-4.14/gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch new file mode 100644 index 00000000000..58f236acb26 --- /dev/null +++ b/queue-4.14/gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch @@ -0,0 +1,61 @@ +From ca9998ba8e29aee92b756e11a385584b4c5f6704 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Nov 2021 21:30:10 +0100 +Subject: gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use + +From: Hans de Goede + +[ Upstream commit bdfd6ab8fdccd8b138837efff66f4a1911496378 ] + +If the IRQ is already in use, then acpi_dev_gpio_irq_get_by() really +should not change the type underneath the current owner. + +I specifically hit an issue with this an a Chuwi Hi8 Super (CWI509) Bay +Trail tablet, when the Boot OS selection in the BIOS is set to Android. +In this case _STA for a MAX17047 ACPI I2C device wrongly returns 0xf and +the _CRS resources for this device include a GpioInt pointing to a GPIO +already in use by an _AEI handler, with a different type then specified +in the _CRS for the MAX17047 device. Leading to the acpi_dev_gpio_irq_get() +call done by the i2c-core-acpi.c code changing the type breaking the +_AEI handler. + +Now this clearly is a bug in the DSDT of this tablet (in Android mode), +but in general calling irq_set_irq_type() on an IRQ which already is +in use seems like a bad idea. + +Signed-off-by: Hans de Goede +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpiolib-acpi.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c +index c380ce957d8da..60e394da97098 100644 +--- a/drivers/gpio/gpiolib-acpi.c ++++ b/drivers/gpio/gpiolib-acpi.c +@@ -943,10 +943,17 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) + irq_flags = acpi_dev_get_irq_type(info.triggering, + info.polarity); + +- /* Set type if specified and different than the current one */ +- if (irq_flags != IRQ_TYPE_NONE && +- irq_flags != irq_get_trigger_type(irq)) +- irq_set_irq_type(irq, irq_flags); ++ /* ++ * If the IRQ is not already in use then set type ++ * if specified and different than the current one. ++ */ ++ if (can_request_irq(irq, irq_flags)) { ++ if (irq_flags != IRQ_TYPE_NONE && ++ irq_flags != irq_get_trigger_type(irq)) ++ irq_set_irq_type(irq, irq_flags); ++ } else { ++ dev_dbg(&adev->dev, "IRQ %d already in use\n", irq); ++ } + + return irq; + } +-- +2.34.1 + diff --git a/queue-4.14/hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch b/queue-4.14/hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch new file mode 100644 index 00000000000..8d0645a8ab3 --- /dev/null +++ b/queue-4.14/hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch @@ -0,0 +1,38 @@ +From 61b4277b18f276e9c66d81796ff640e8c46d40de Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Nov 2021 08:29:53 +0100 +Subject: HID: apple: Do not reset quirks when the Fn key is not found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: José Expósito + +[ Upstream commit a5fe7864d8ada170f19cc47d176bf8260ffb4263 ] + +When a keyboard without a function key is detected, instead of removing +all quirks, remove only the APPLE_HAS_FN quirk. + +Signed-off-by: José Expósito +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-apple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c +index 4e3dd3f55a963..80ecbf14d3c82 100644 +--- a/drivers/hid/hid-apple.c ++++ b/drivers/hid/hid-apple.c +@@ -392,7 +392,7 @@ static int apple_input_configured(struct hid_device *hdev, + + if ((asc->quirks & APPLE_HAS_FN) && !asc->fn_found) { + hid_info(hdev, "Fn key not found (Apple Wireless Keyboard clone?), disabling Fn key handling\n"); +- asc->quirks = 0; ++ asc->quirks &= ~APPLE_HAS_FN; + } + + return 0; +-- +2.34.1 + diff --git a/queue-4.14/hsi-core-fix-return-freed-object-in-hsi_new_client.patch b/queue-4.14/hsi-core-fix-return-freed-object-in-hsi_new_client.patch new file mode 100644 index 00000000000..568fe392f05 --- /dev/null +++ b/queue-4.14/hsi-core-fix-return-freed-object-in-hsi_new_client.patch @@ -0,0 +1,35 @@ +From d06ebcf614ed2ffb46e8387dbf0ba9c30da25fe1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 06:45:07 -0700 +Subject: HSI: core: Fix return freed object in hsi_new_client + +From: Chengfeng Ye + +[ Upstream commit a1ee1c08fcd5af03187dcd41dcab12fd5b379555 ] + +cl is freed on error of calling device_register, but this +object is return later, which will cause uaf issue. Fix it +by return NULL on error. + +Signed-off-by: Chengfeng Ye +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/hsi/hsi_core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c +index 71895da63810b..daf2de837a30a 100644 +--- a/drivers/hsi/hsi_core.c ++++ b/drivers/hsi/hsi_core.c +@@ -115,6 +115,7 @@ struct hsi_client *hsi_new_client(struct hsi_port *port, + if (device_register(&cl->device) < 0) { + pr_err("hsi: failed to register client: %s\n", info->name); + put_device(&cl->device); ++ goto err; + } + + return cl; +-- +2.34.1 + diff --git a/queue-4.14/i2c-designware-pci-fix-to-change-data-types-of-hcnt-.patch b/queue-4.14/i2c-designware-pci-fix-to-change-data-types-of-hcnt-.patch new file mode 100644 index 00000000000..25b7b6f2a56 --- /dev/null +++ b/queue-4.14/i2c-designware-pci-fix-to-change-data-types-of-hcnt-.patch @@ -0,0 +1,45 @@ +From 09a6df0054660b87b8b39af8ab4fdfc7430e9f77 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Dec 2021 17:12:01 +0200 +Subject: i2c: designware-pci: Fix to change data types of hcnt and lcnt + parameters + +From: Lakshmi Sowjanya D + +[ Upstream commit d52097010078c1844348dc0e467305e5f90fd317 ] + +The data type of hcnt and lcnt in the struct dw_i2c_dev is of type u16. +It's better to have same data type in struct dw_scl_sda_cfg as well. + +Reported-by: Wolfram Sang +Signed-off-by: Lakshmi Sowjanya D +Signed-off-by: Andy Shevchenko +Signed-off-by: Jarkko Nikula +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-designware-pcidrv.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c +index 86e1bd0b82e91..347d82dff67c0 100644 +--- a/drivers/i2c/busses/i2c-designware-pcidrv.c ++++ b/drivers/i2c/busses/i2c-designware-pcidrv.c +@@ -50,10 +50,10 @@ enum dw_pci_ctl_id_t { + }; + + struct dw_scl_sda_cfg { +- u32 ss_hcnt; +- u32 fs_hcnt; +- u32 ss_lcnt; +- u32 fs_lcnt; ++ u16 ss_hcnt; ++ u16 fs_hcnt; ++ u16 ss_lcnt; ++ u16 fs_lcnt; + u32 sda_hold; + }; + +-- +2.34.1 + diff --git a/queue-4.14/i2c-i801-don-t-silently-correct-invalid-transfer-siz.patch b/queue-4.14/i2c-i801-don-t-silently-correct-invalid-transfer-siz.patch new file mode 100644 index 00000000000..41478234a4a --- /dev/null +++ b/queue-4.14/i2c-i801-don-t-silently-correct-invalid-transfer-siz.patch @@ -0,0 +1,63 @@ +From d00a270ff9c8277c1c7482c53ea04f533510c7af Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Nov 2021 22:57:00 +0100 +Subject: i2c: i801: Don't silently correct invalid transfer size + +From: Heiner Kallweit + +[ Upstream commit effa453168a7eeb8a562ff4edc1dbf9067360a61 ] + +If an invalid block size is provided, reject it instead of silently +changing it to a supported value. Especially critical I see the case of +a write transfer with block length 0. In this case we have no guarantee +that the byte we would write is valid. When silently reducing a read to +32 bytes then we don't return an error and the caller may falsely +assume that we returned the full requested data. + +If this change should break any (broken) caller, then I think we should +fix the caller. + +Signed-off-by: Heiner Kallweit +Reviewed-by: Jean Delvare +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-i801.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c +index 7b1654b0fb6db..c817e3d4b52b8 100644 +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -769,6 +769,11 @@ static int i801_block_transaction(struct i801_priv *priv, + int result = 0; + unsigned char hostc; + ++ if (read_write == I2C_SMBUS_READ && command == I2C_SMBUS_BLOCK_DATA) ++ data->block[0] = I2C_SMBUS_BLOCK_MAX; ++ else if (data->block[0] < 1 || data->block[0] > I2C_SMBUS_BLOCK_MAX) ++ return -EPROTO; ++ + if (command == I2C_SMBUS_I2C_BLOCK_DATA) { + if (read_write == I2C_SMBUS_WRITE) { + /* set I2C_EN bit in configuration register */ +@@ -782,16 +787,6 @@ static int i801_block_transaction(struct i801_priv *priv, + } + } + +- if (read_write == I2C_SMBUS_WRITE +- || command == I2C_SMBUS_I2C_BLOCK_DATA) { +- if (data->block[0] < 1) +- data->block[0] = 1; +- if (data->block[0] > I2C_SMBUS_BLOCK_MAX) +- data->block[0] = I2C_SMBUS_BLOCK_MAX; +- } else { +- data->block[0] = 32; /* max for SMBus block reads */ +- } +- + /* Experience has shown that the block buffer can only be used for + SMBus (not I2C) block transactions, even though the datasheet + doesn't mention this limitation. */ +-- +2.34.1 + diff --git a/queue-4.14/i2c-mpc-correct-i2c-reset-procedure.patch b/queue-4.14/i2c-mpc-correct-i2c-reset-procedure.patch new file mode 100644 index 00000000000..e8a64d6f632 --- /dev/null +++ b/queue-4.14/i2c-mpc-correct-i2c-reset-procedure.patch @@ -0,0 +1,70 @@ +From 1076ac536cb8c04482479cc7956a614e2932aa28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 May 2017 14:20:33 +0200 +Subject: i2c: mpc: Correct I2C reset procedure + +From: Joakim Tjernlund + +[ Upstream commit ebe82cf92cd4825c3029434cabfcd2f1780e64be ] + +Current I2C reset procedure is broken in two ways: +1) It only generate 1 START instead of 9 STARTs and STOP. +2) It leaves the bus Busy so every I2C xfer after the first + fixup calls the reset routine again, for every xfer there after. + +This fixes both errors. + +Signed-off-by: Joakim Tjernlund +Acked-by: Scott Wood +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-mpc.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c +index 7db5554d2b4e7..194bf06ecb25e 100644 +--- a/drivers/i2c/busses/i2c-mpc.c ++++ b/drivers/i2c/busses/i2c-mpc.c +@@ -107,23 +107,30 @@ static irqreturn_t mpc_i2c_isr(int irq, void *dev_id) + /* Sometimes 9th clock pulse isn't generated, and slave doesn't release + * the bus, because it wants to send ACK. + * Following sequence of enabling/disabling and sending start/stop generates +- * the 9 pulses, so it's all OK. ++ * the 9 pulses, each with a START then ending with STOP, so it's all OK. + */ + static void mpc_i2c_fixup(struct mpc_i2c *i2c) + { + int k; +- u32 delay_val = 1000000 / i2c->real_clk + 1; +- +- if (delay_val < 2) +- delay_val = 2; ++ unsigned long flags; + + for (k = 9; k; k--) { + writeccr(i2c, 0); +- writeccr(i2c, CCR_MSTA | CCR_MTX | CCR_MEN); ++ writeb(0, i2c->base + MPC_I2C_SR); /* clear any status bits */ ++ writeccr(i2c, CCR_MEN | CCR_MSTA); /* START */ ++ readb(i2c->base + MPC_I2C_DR); /* init xfer */ ++ udelay(15); /* let it hit the bus */ ++ local_irq_save(flags); /* should not be delayed further */ ++ writeccr(i2c, CCR_MEN | CCR_MSTA | CCR_RSTA); /* delay SDA */ + readb(i2c->base + MPC_I2C_DR); +- writeccr(i2c, CCR_MEN); +- udelay(delay_val << 1); ++ if (k != 1) ++ udelay(5); ++ local_irq_restore(flags); + } ++ writeccr(i2c, CCR_MEN); /* Initiate STOP */ ++ readb(i2c->base + MPC_I2C_DR); ++ udelay(15); /* Let STOP propagate */ ++ writeccr(i2c, 0); + } + + static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) +-- +2.34.1 + diff --git a/queue-4.14/iommu-iova-fix-race-between-fq-timeout-and-teardown.patch b/queue-4.14/iommu-iova-fix-race-between-fq-timeout-and-teardown.patch new file mode 100644 index 00000000000..210e6bea545 --- /dev/null +++ b/queue-4.14/iommu-iova-fix-race-between-fq-timeout-and-teardown.patch @@ -0,0 +1,53 @@ +From 79a50fdc18c506275cba8898816a824cc455f2eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Dec 2021 15:30:55 +0000 +Subject: iommu/iova: Fix race between FQ timeout and teardown + +From: Xiongfeng Wang + +[ Upstream commit d7061627d701c90e1cac1e1e60c45292f64f3470 ] + +It turns out to be possible for hotplugging out a device to reach the +stage of tearing down the device's group and default domain before the +domain's flush queue has drained naturally. At this point, it is then +possible for the timeout to expire just before the del_timer() call +in free_iova_flush_queue(), such that we then proceed to free the FQ +resources while fq_flush_timeout() is still accessing them on another +CPU. Crashes due to this have been observed in the wild while removing +NVMe devices. + +Close the race window by using del_timer_sync() to safely wait for any +active timeout handler to finish before we start to free things. We +already avoid any locking in free_iova_flush_queue() since the FQ is +supposed to be inactive anyway, so the potential deadlock scenario does +not apply. + +Fixes: 9a005a800ae8 ("iommu/iova: Add flush timer") +Reviewed-by: John Garry +Signed-off-by: Xiongfeng Wang +[ rm: rewrite commit message ] +Signed-off-by: Robin Murphy +Link: https://lore.kernel.org/r/0a365e5b07f14b7344677ad6a9a734966a8422ce.1639753638.git.robin.murphy@arm.com +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +--- + drivers/iommu/iova.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c +index 2c97d2552c5bd..ebee9e191b3ee 100644 +--- a/drivers/iommu/iova.c ++++ b/drivers/iommu/iova.c +@@ -68,8 +68,7 @@ static void free_iova_flush_queue(struct iova_domain *iovad) + if (!has_iova_flush_queue(iovad)) + return; + +- if (timer_pending(&iovad->fq_timer)) +- del_timer(&iovad->fq_timer); ++ del_timer_sync(&iovad->fq_timer); + + fq_destroy_all_entries(iovad); + +-- +2.34.1 + diff --git a/queue-4.14/iwlwifi-fix-leaks-bad-data-after-failed-firmware-loa.patch b/queue-4.14/iwlwifi-fix-leaks-bad-data-after-failed-firmware-loa.patch new file mode 100644 index 00000000000..be5fd7a41a3 --- /dev/null +++ b/queue-4.14/iwlwifi-fix-leaks-bad-data-after-failed-firmware-loa.patch @@ -0,0 +1,69 @@ +From 3f3f0c477c9f721e1ba92031a10397eb2217185c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 11:12:42 +0200 +Subject: iwlwifi: fix leaks/bad data after failed firmware load + +From: Johannes Berg + +[ Upstream commit ab07506b0454bea606095951e19e72c282bfbb42 ] + +If firmware load fails after having loaded some parts of the +firmware, e.g. the IML image, then this would leak. For the +host command list we'd end up running into a WARN on the next +attempt to load another firmware image. + +Fix this by calling iwl_dealloc_ucode() on failures, and make +that also clear the data so we start fresh on the next round. + +Signed-off-by: Johannes Berg +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +index 6c10b8c4ddbe5..95101f66a886e 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -182,6 +182,9 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv) + + for (i = 0; i < IWL_UCODE_TYPE_MAX; i++) + iwl_free_fw_img(drv, drv->fw.img + i); ++ ++ /* clear the data for the aborted load case */ ++ memset(&drv->fw, 0, sizeof(drv->fw)); + } + + static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc, +@@ -1271,6 +1274,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) + int i; + bool load_module = false; + bool usniffer_images = false; ++ bool failure = true; + + fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH; + fw->ucode_capa.standard_phy_calibration_size = +@@ -1499,6 +1503,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) + op->name, err); + #endif + } ++ failure = false; + goto free; + + try_again: +@@ -1514,6 +1519,9 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) + complete(&drv->request_firmware_complete); + device_release_driver(drv->trans->dev); + free: ++ if (failure) ++ iwl_dealloc_ucode(drv); ++ + if (pieces) { + for (i = 0; i < ARRAY_SIZE(pieces->img); i++) + kfree(pieces->img[i].sec); +-- +2.34.1 + diff --git a/queue-4.14/iwlwifi-mvm-synchronize-with-fw-after-multicast-comm.patch b/queue-4.14/iwlwifi-mvm-synchronize-with-fw-after-multicast-comm.patch new file mode 100644 index 00000000000..d2df754314d --- /dev/null +++ b/queue-4.14/iwlwifi-mvm-synchronize-with-fw-after-multicast-comm.patch @@ -0,0 +1,72 @@ +From 26f4a3d51f215cad2a4ce42818a6de2be2847a1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Dec 2021 08:35:45 +0200 +Subject: iwlwifi: mvm: synchronize with FW after multicast commands + +From: Johannes Berg + +[ Upstream commit db66abeea3aefed481391ecc564fb7b7fb31d742 ] + +If userspace installs a lot of multicast groups very quickly, then +we may run out of command queue space as we send the updates in an +asynchronous fashion (due to locking concerns), and the CPU can +create them faster than the firmware can process them. This is true +even when mac80211 has a work struct that gets scheduled. + +Fix this by synchronizing with the firmware after sending all those +commands - outside of the iteration we can send a synchronous echo +command that just has the effect of the CPU waiting for the prior +asynchronous commands to finish. This also will cause fewer of the +commands to be sent to the firmware overall, because the work will +only run once when rescheduled multiple times while it's running. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=213649 +Suggested-by: Emmanuel Grumbach +Reported-by: Maximilian Ernestus +Signed-off-by: Johannes Berg +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/iwlwifi.20211204083238.51aea5b79ea4.I88a44798efda16e9fe480fb3e94224931d311b29@changeid +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +index d82d8cfe2e41c..f896758a3fa31 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +@@ -1608,6 +1608,7 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm) + struct iwl_mvm_mc_iter_data iter_data = { + .mvm = mvm, + }; ++ int ret; + + lockdep_assert_held(&mvm->mutex); + +@@ -1617,6 +1618,22 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm) + ieee80211_iterate_active_interfaces_atomic( + mvm->hw, IEEE80211_IFACE_ITER_NORMAL, + iwl_mvm_mc_iface_iterator, &iter_data); ++ ++ /* ++ * Send a (synchronous) ech command so that we wait for the ++ * multiple asynchronous MCAST_FILTER_CMD commands sent by ++ * the interface iterator. Otherwise, we might get here over ++ * and over again (by userspace just sending a lot of these) ++ * and the CPU can send them faster than the firmware can ++ * process them. ++ * Note that the CPU is still faster - but with this we'll ++ * actually send fewer commands overall because the CPU will ++ * not schedule the work in mac80211 as frequently if it's ++ * still running when rescheduled (possibly multiple times). ++ */ ++ ret = iwl_mvm_send_cmd_pdu(mvm, ECHO_CMD, 0, 0, NULL); ++ if (ret) ++ IWL_ERR(mvm, "Failed to synchronize multicast groups update\n"); + } + + static u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw, +-- +2.34.1 + diff --git a/queue-4.14/iwlwifi-remove-module-loading-failure-message.patch b/queue-4.14/iwlwifi-remove-module-loading-failure-message.patch new file mode 100644 index 00000000000..ec296526fd3 --- /dev/null +++ b/queue-4.14/iwlwifi-remove-module-loading-failure-message.patch @@ -0,0 +1,51 @@ +From 1b3888c737c3646834067f9eea7139e1ef16a5c1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 11:12:45 +0200 +Subject: iwlwifi: remove module loading failure message + +From: Johannes Berg + +[ Upstream commit 6518f83ffa51131daaf439b66094f684da3fb0ae ] + +When CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, iwlwifi crashes +when the opmode module cannot be loaded, due to completing +the completion before using drv->dev, which can then already +be freed. + +Fix this by removing the (fairly useless) message. Moving the +completion later causes a deadlock instead, so that's not an +option. + +Signed-off-by: Johannes Berg +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/20211210091245.289008-2-luca@coelho.fi +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +index 95101f66a886e..ade3c27050471 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -1494,15 +1494,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) + * else from proceeding if the module fails to load + * or hangs loading. + */ +- if (load_module) { ++ if (load_module) + request_module("%s", op->name); +-#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR +- if (err) +- IWL_ERR(drv, +- "failed to load module %s (error %d), is dynamic loading enabled?\n", +- op->name, err); +-#endif +- } + failure = false; + goto free; + +-- +2.34.1 + diff --git a/queue-4.14/jffs2-gc-deadlock-reading-a-page-that-is-used-in-jff.patch b/queue-4.14/jffs2-gc-deadlock-reading-a-page-that-is-used-in-jff.patch new file mode 100644 index 00000000000..8e9a2a914be --- /dev/null +++ b/queue-4.14/jffs2-gc-deadlock-reading-a-page-that-is-used-in-jff.patch @@ -0,0 +1,133 @@ +From b80d5534f0187126eabe2787fba88a670d637f0d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 4 Jul 2017 16:22:38 +1200 +Subject: jffs2: GC deadlock reading a page that is used in jffs2_write_begin() + +From: Kyeong Yoo + +[ Upstream commit aa39cc675799bc92da153af9a13d6f969c348e82 ] + +GC task can deadlock in read_cache_page() because it may attempt +to release a page that is actually allocated by another task in +jffs2_write_begin(). +The reason is that in jffs2_write_begin() there is a small window +a cache page is allocated for use but not set Uptodate yet. + +This ends up with a deadlock between two tasks: +1) A task (e.g. file copy) + - jffs2_write_begin() locks a cache page + - jffs2_write_end() tries to lock "alloc_sem" from + jffs2_reserve_space() <-- STUCK +2) GC task (jffs2_gcd_mtd3) + - jffs2_garbage_collect_pass() locks "alloc_sem" + - try to lock the same cache page in read_cache_page() <-- STUCK + +So to avoid this deadlock, hold "alloc_sem" in jffs2_write_begin() +while reading data in a cache page. + +Signed-off-by: Kyeong Yoo +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/jffs2/file.c | 40 +++++++++++++++++++++++++--------------- + 1 file changed, 25 insertions(+), 15 deletions(-) + +diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c +index bd0428bebe9b7..221eb2bd205e4 100644 +--- a/fs/jffs2/file.c ++++ b/fs/jffs2/file.c +@@ -135,20 +135,15 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, + struct page *pg; + struct inode *inode = mapping->host; + struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); ++ struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb); + pgoff_t index = pos >> PAGE_SHIFT; + uint32_t pageofs = index << PAGE_SHIFT; + int ret = 0; + +- pg = grab_cache_page_write_begin(mapping, index, flags); +- if (!pg) +- return -ENOMEM; +- *pagep = pg; +- + jffs2_dbg(1, "%s()\n", __func__); + + if (pageofs > inode->i_size) { + /* Make new hole frag from old EOF to new page */ +- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb); + struct jffs2_raw_inode ri; + struct jffs2_full_dnode *fn; + uint32_t alloc_len; +@@ -159,7 +154,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, + ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len, + ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE); + if (ret) +- goto out_page; ++ goto out_err; + + mutex_lock(&f->sem); + memset(&ri, 0, sizeof(ri)); +@@ -189,7 +184,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, + ret = PTR_ERR(fn); + jffs2_complete_reservation(c); + mutex_unlock(&f->sem); +- goto out_page; ++ goto out_err; + } + ret = jffs2_add_full_dnode_to_inode(c, f, fn); + if (f->metadata) { +@@ -204,13 +199,26 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, + jffs2_free_full_dnode(fn); + jffs2_complete_reservation(c); + mutex_unlock(&f->sem); +- goto out_page; ++ goto out_err; + } + jffs2_complete_reservation(c); + inode->i_size = pageofs; + mutex_unlock(&f->sem); + } + ++ /* ++ * While getting a page and reading data in, lock c->alloc_sem until ++ * the page is Uptodate. Otherwise GC task may attempt to read the same ++ * page in read_cache_page(), which causes a deadlock. ++ */ ++ mutex_lock(&c->alloc_sem); ++ pg = grab_cache_page_write_begin(mapping, index, flags); ++ if (!pg) { ++ ret = -ENOMEM; ++ goto release_sem; ++ } ++ *pagep = pg; ++ + /* + * Read in the page if it wasn't already present. Cannot optimize away + * the whole page write case until jffs2_write_end can handle the +@@ -220,15 +228,17 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, + mutex_lock(&f->sem); + ret = jffs2_do_readpage_nolock(inode, pg); + mutex_unlock(&f->sem); +- if (ret) +- goto out_page; ++ if (ret) { ++ unlock_page(pg); ++ put_page(pg); ++ goto release_sem; ++ } + } + jffs2_dbg(1, "end write_begin(). pg->flags %lx\n", pg->flags); +- return ret; + +-out_page: +- unlock_page(pg); +- put_page(pg); ++release_sem: ++ mutex_unlock(&c->alloc_sem); ++out_err: + return ret; + } + +-- +2.34.1 + diff --git a/queue-4.14/mac80211-allow-non-standard-vht-mcs-10-11.patch b/queue-4.14/mac80211-allow-non-standard-vht-mcs-10-11.patch new file mode 100644 index 00000000000..64ce360ac41 --- /dev/null +++ b/queue-4.14/mac80211-allow-non-standard-vht-mcs-10-11.patch @@ -0,0 +1,49 @@ +From e770149790ad92e4f30418457c9e3201931d5875 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Jan 2022 09:36:21 +0800 +Subject: mac80211: allow non-standard VHT MCS-10/11 + +From: Ping-Ke Shih + +[ Upstream commit 04be6d337d37400ad5b3d5f27ca87645ee5a18a3 ] + +Some AP can possibly try non-standard VHT rate and mac80211 warns and drops +packets, and leads low TCP throughput. + + Rate marked as a VHT rate but data is invalid: MCS: 10, NSS: 2 + WARNING: CPU: 1 PID: 7817 at net/mac80211/rx.c:4856 ieee80211_rx_list+0x223/0x2f0 [mac8021 + +Since commit c27aa56a72b8 ("cfg80211: add VHT rate entries for MCS-10 and MCS-11") +has added, mac80211 adds this support as well. + +After this patch, throughput is good and iw can get the bitrate: + rx bitrate: 975.1 MBit/s VHT-MCS 10 80MHz short GI VHT-NSS 2 +or + rx bitrate: 1083.3 MBit/s VHT-MCS 11 80MHz short GI VHT-NSS 2 + +Buglink: https://bugzilla.suse.com/show_bug.cgi?id=1192891 +Reported-by: Goldwyn Rodrigues +Signed-off-by: Ping-Ke Shih +Link: https://lore.kernel.org/r/20220103013623.17052-1-pkshih@realtek.com +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index cbe1177d95f9e..13cae95a34662 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -4434,7 +4434,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, + goto drop; + break; + case RX_ENC_VHT: +- if (WARN_ONCE(status->rate_idx > 9 || ++ if (WARN_ONCE(status->rate_idx > 11 || + !status->nss || + status->nss > 8, + "Rate marked as a VHT rate but data is invalid: MCS: %d, NSS: %d\n", +-- +2.34.1 + diff --git a/queue-4.14/media-b2c2-add-missing-check-in-flexcop_pci_isr.patch b/queue-4.14/media-b2c2-add-missing-check-in-flexcop_pci_isr.patch new file mode 100644 index 00000000000..1c63f81e6d2 --- /dev/null +++ b/queue-4.14/media-b2c2-add-missing-check-in-flexcop_pci_isr.patch @@ -0,0 +1,163 @@ +From eea618b6f8c9fa9f5dbafe59cf30fe3fa5327ef4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 May 2021 10:00:03 +0100 +Subject: media: b2c2: Add missing check in flexcop_pci_isr: + +From: Zheyu Ma + +[ Upstream commit b13203032e679674c7c518f52a7ec0801ca3a829 ] + +A out-of-bounds bug can be triggered by an interrupt, the reason for +this bug is the lack of checking of register values. + +In flexcop_pci_isr, the driver reads value from a register and uses it as +a dma address. Finally, this address will be passed to the count parameter +of find_next_packet. If this value is larger than the size of dma, the +index of buffer will be out-of-bounds. + +Fix this by adding a check after reading the value of the register. + +The following KASAN report reveals it: + +BUG: KASAN: slab-out-of-bounds in find_next_packet +drivers/media/dvb-core/dvb_demux.c:528 [inline] +BUG: KASAN: slab-out-of-bounds in _dvb_dmx_swfilter +drivers/media/dvb-core/dvb_demux.c:572 [inline] +BUG: KASAN: slab-out-of-bounds in dvb_dmx_swfilter+0x3fa/0x420 +drivers/media/dvb-core/dvb_demux.c:603 +Read of size 1 at addr ffff8880608c00a0 by task swapper/2/0 + +CPU: 2 PID: 0 Comm: swapper/2 Not tainted 4.19.177-gdba4159c14ef #25 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS +rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu.org 04/01/2014 +Call Trace: + + __dump_stack lib/dump_stack.c:77 [inline] + dump_stack+0xec/0x156 lib/dump_stack.c:118 + print_address_description+0x78/0x290 mm/kasan/report.c:256 + kasan_report_error mm/kasan/report.c:354 [inline] + kasan_report+0x25b/0x380 mm/kasan/report.c:412 + __asan_report_load1_noabort+0x19/0x20 mm/kasan/report.c:430 + find_next_packet drivers/media/dvb-core/dvb_demux.c:528 [inline] + _dvb_dmx_swfilter drivers/media/dvb-core/dvb_demux.c:572 [inline] + dvb_dmx_swfilter+0x3fa/0x420 drivers/media/dvb-core/dvb_demux.c:603 + flexcop_pass_dmx_data+0x2e/0x40 drivers/media/common/b2c2/flexcop.c:167 + flexcop_pci_isr+0x3d1/0x5d0 drivers/media/pci/b2c2/flexcop-pci.c:212 + __handle_irq_event_percpu+0xfb/0x770 kernel/irq/handle.c:149 + handle_irq_event_percpu+0x79/0x150 kernel/irq/handle.c:189 + handle_irq_event+0xac/0x140 kernel/irq/handle.c:206 + handle_fasteoi_irq+0x232/0x5c0 kernel/irq/chip.c:725 + generic_handle_irq_desc include/linux/irqdesc.h:155 [inline] + handle_irq+0x230/0x3a0 arch/x86/kernel/irq_64.c:87 + do_IRQ+0xa7/0x1e0 arch/x86/kernel/irq.c:247 + common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:670 + +RIP: 0010:native_safe_halt+0x28/0x30 arch/x86/include/asm/irqflags.h:61 +Code: 00 00 55 be 04 00 00 00 48 c7 c7 00 62 2f 8c 48 89 e5 e8 fb 31 +e8 f8 8b 05 75 4f 8e 03 85 c0 7e 07 0f 00 2d 8a 61 66 00 fb f4 <5d> c3 +90 90 90 90 90 90 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 +RSP: 0018:ffff88806b71fcc8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffde +RAX: 0000000000000000 RBX: ffffffff8bde44c8 RCX: ffffffff88a11285 +RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffff8c2f6200 +RBP: ffff88806b71fcc8 R08: fffffbfff185ec40 R09: fffffbfff185ec40 +R10: 0000000000000001 R11: fffffbfff185ec40 R12: 0000000000000002 +R13: ffffffff8be9d6e0 R14: 0000000000000000 R15: 0000000000000000 + arch_safe_halt arch/x86/include/asm/paravirt.h:94 [inline] + default_idle+0x6f/0x360 arch/x86/kernel/process.c:557 + arch_cpu_idle+0xf/0x20 arch/x86/kernel/process.c:548 + default_idle_call+0x3b/0x60 kernel/sched/idle.c:93 + cpuidle_idle_call kernel/sched/idle.c:153 [inline] + do_idle+0x2ab/0x3c0 kernel/sched/idle.c:263 + cpu_startup_entry+0xcb/0xe0 kernel/sched/idle.c:369 + start_secondary+0x3b8/0x4e0 arch/x86/kernel/smpboot.c:271 + secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:243 + +Allocated by task 1: + save_stack+0x43/0xd0 mm/kasan/kasan.c:448 + set_track mm/kasan/kasan.c:460 [inline] + kasan_kmalloc+0xad/0xe0 mm/kasan/kasan.c:553 + kasan_slab_alloc+0x11/0x20 mm/kasan/kasan.c:490 + slab_post_alloc_hook mm/slab.h:445 [inline] + slab_alloc_node mm/slub.c:2741 [inline] + slab_alloc mm/slub.c:2749 [inline] + kmem_cache_alloc+0xeb/0x280 mm/slub.c:2754 + kmem_cache_zalloc include/linux/slab.h:699 [inline] + __kernfs_new_node+0xe2/0x6f0 fs/kernfs/dir.c:633 + kernfs_new_node+0x9a/0x120 fs/kernfs/dir.c:693 + __kernfs_create_file+0x5f/0x340 fs/kernfs/file.c:992 + sysfs_add_file_mode_ns+0x22a/0x4e0 fs/sysfs/file.c:306 + create_files fs/sysfs/group.c:63 [inline] + internal_create_group+0x34e/0xc30 fs/sysfs/group.c:147 + sysfs_create_group fs/sysfs/group.c:173 [inline] + sysfs_create_groups+0x9c/0x140 fs/sysfs/group.c:200 + driver_add_groups+0x3e/0x50 drivers/base/driver.c:129 + bus_add_driver+0x3a5/0x790 drivers/base/bus.c:684 + driver_register+0x1cd/0x410 drivers/base/driver.c:170 + __pci_register_driver+0x197/0x200 drivers/pci/pci-driver.c:1411 + cx88_audio_pci_driver_init+0x23/0x25 drivers/media/pci/cx88/cx88-alsa.c: + 1017 + do_one_initcall+0xe0/0x610 init/main.c:884 + do_initcall_level init/main.c:952 [inline] + do_initcalls init/main.c:960 [inline] + do_basic_setup init/main.c:978 [inline] + kernel_init_freeable+0x4d0/0x592 init/main.c:1145 + kernel_init+0x18/0x190 init/main.c:1062 + ret_from_fork+0x24/0x30 arch/x86/entry/entry_64.S:415 + +Freed by task 0: +(stack is not available) + +The buggy address belongs to the object at ffff8880608c0000 + which belongs to the cache kernfs_node_cache of size 160 +The buggy address is located 0 bytes to the right of + 160-byte region [ffff8880608c0000, ffff8880608c00a0) +The buggy address belongs to the page: +page:ffffea0001823000 count:1 mapcount:0 mapping:ffff88806bed1e00 +index:0x0 compound_mapcount: 0 +flags: 0x100000000008100(slab|head) +raw: 0100000000008100 dead000000000100 dead000000000200 ffff88806bed1e00 +raw: 0000000000000000 0000000000240024 00000001ffffffff 0000000000000000 +page dumped because: kasan: bad access detected + +Memory state around the buggy address: + ffff8880608bff80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + ffff8880608c0000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +>ffff8880608c0080: 00 00 00 00 fc fc fc fc fc fc fc fc 00 00 00 00 + ^ + ffff8880608c0100: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + ffff8880608c0180: fc fc fc fc fc fc fc fc 00 00 00 00 00 00 00 00 +================================================================== + +Link: https://lore.kernel.org/linux-media/1620723603-30912-1-git-send-email-zheyuma97@gmail.com +Reported-by: Zheyu Ma +Signed-off-by: Zheyu Ma +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/pci/b2c2/flexcop-pci.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c +index cc6527e355373..b7d8e34ffd5da 100644 +--- a/drivers/media/pci/b2c2/flexcop-pci.c ++++ b/drivers/media/pci/b2c2/flexcop-pci.c +@@ -184,6 +184,8 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) + dma_addr_t cur_addr = + fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2; + u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0; ++ if (cur_pos > fc_pci->dma[0].size * 2) ++ goto error; + + deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x ", + jiffies_to_usecs(jiffies - fc_pci->last_irq), +@@ -224,6 +226,7 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) + ret = IRQ_NONE; + } + ++error: + spin_unlock_irqrestore(&fc_pci->irq_lock, flags); + return ret; + } +-- +2.34.1 + diff --git a/queue-4.14/media-dib8000-fix-a-memleak-in-dib8000_init.patch b/queue-4.14/media-dib8000-fix-a-memleak-in-dib8000_init.patch new file mode 100644 index 00000000000..c9df3ca6d99 --- /dev/null +++ b/queue-4.14/media-dib8000-fix-a-memleak-in-dib8000_init.patch @@ -0,0 +1,55 @@ +From 259d697276ea323eda2dcf8546b723347fadd297 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Nov 2021 16:38:05 +0100 +Subject: media: dib8000: Fix a memleak in dib8000_init() + +From: Zhou Qingyang + +[ Upstream commit 8dbdcc7269a83305ee9d677b75064d3530a48ee2 ] + +In dib8000_init(), the variable fe is not freed or passed out on the +failure of dib8000_identify(&state->i2c), which could lead to a memleak. + +Fix this bug by adding a kfree of fe in the error path. + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_DVB_DIB8000=m show no new warnings, +and our static analyzer no longer warns about this code. + +Fixes: 77e2c0f5d471 ("V4L/DVB (12900): DiB8000: added support for DiBcom ISDB-T/ISDB-Tsb demodulator DiB8000") +Signed-off-by: Zhou Qingyang +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/dib8000.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c +index 59ab01dc62b19..c429392ebbe63 100644 +--- a/drivers/media/dvb-frontends/dib8000.c ++++ b/drivers/media/dvb-frontends/dib8000.c +@@ -4476,8 +4476,10 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad + + state->timf_default = cfg->pll->timf; + +- if (dib8000_identify(&state->i2c) == 0) ++ if (dib8000_identify(&state->i2c) == 0) { ++ kfree(fe); + goto error; ++ } + + dibx000_init_i2c_master(&state->i2c_master, DIB8000, state->i2c.adap, state->i2c.addr); + +-- +2.34.1 + diff --git a/queue-4.14/media-dmxdev-fix-uaf-when-dvb_register_device-fails.patch b/queue-4.14/media-dmxdev-fix-uaf-when-dvb_register_device-fails.patch new file mode 100644 index 00000000000..369f85a6a20 --- /dev/null +++ b/queue-4.14/media-dmxdev-fix-uaf-when-dvb_register_device-fails.patch @@ -0,0 +1,104 @@ +From 3b901399fa2ab59158bf661cfe3e7d9a9cfcd773 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 15 Oct 2021 16:57:41 +0800 +Subject: media: dmxdev: fix UAF when dvb_register_device() fails + +From: Wang Hai + +[ Upstream commit ab599eb11882f834951c436cc080c3455ba32b9b ] + +I got a use-after-free report: + +dvbdev: dvb_register_device: failed to create device dvb1.dvr0 (-12) +... +================================================================== +BUG: KASAN: use-after-free in dvb_dmxdev_release+0xce/0x2f0 +... +Call Trace: + dump_stack_lvl+0x6c/0x8b + print_address_description.constprop.0+0x48/0x70 + kasan_report.cold+0x82/0xdb + __asan_load4+0x6b/0x90 + dvb_dmxdev_release+0xce/0x2f0 +... +Allocated by task 7666: + kasan_save_stack+0x23/0x50 + __kasan_kmalloc+0x83/0xa0 + kmem_cache_alloc_trace+0x22e/0x470 + dvb_register_device+0x12f/0x980 + dvb_dmxdev_init+0x1f3/0x230 +... +Freed by task 7666: + kasan_save_stack+0x23/0x50 + kasan_set_track+0x20/0x30 + kasan_set_free_info+0x24/0x40 + __kasan_slab_free+0xf2/0x130 + kfree+0xd1/0x5c0 + dvb_register_device.cold+0x1ac/0x1fa + dvb_dmxdev_init+0x1f3/0x230 +... + +When dvb_register_device() in dvb_dmxdev_init() fails, dvb_dmxdev_init() +does not return a failure, and the memory pointed to by dvbdev or +dvr_dvbdev is invalid at this point. If they are used subsequently, it +will result in UFA or null-ptr-deref. + +If dvb_register_device() in dvb_dmxdev_init() fails, fix the bug by making +dvb_dmxdev_init() return an error as well. + +Link: https://lore.kernel.org/linux-media/20211015085741.1203283-1-wanghai38@huawei.com + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-core/dmxdev.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c +index 51009b2718a3e..ab9c4dba2a695 100644 +--- a/drivers/media/dvb-core/dmxdev.c ++++ b/drivers/media/dvb-core/dmxdev.c +@@ -1209,7 +1209,7 @@ static const struct dvb_device dvbdev_dvr = { + }; + int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) + { +- int i; ++ int i, ret; + + if (dmxdev->demux->open(dmxdev->demux) < 0) + return -EUSERS; +@@ -1227,14 +1227,26 @@ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) + DMXDEV_STATE_FREE); + } + +- dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev, ++ ret = dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev, + DVB_DEVICE_DEMUX, dmxdev->filternum); +- dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, ++ if (ret < 0) ++ goto err_register_dvbdev; ++ ++ ret = dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, + dmxdev, DVB_DEVICE_DVR, dmxdev->filternum); ++ if (ret < 0) ++ goto err_register_dvr_dvbdev; + + dvb_ringbuffer_init(&dmxdev->dvr_buffer, NULL, 8192); + + return 0; ++ ++err_register_dvr_dvbdev: ++ dvb_unregister_device(dmxdev->dvbdev); ++err_register_dvbdev: ++ vfree(dmxdev->filter); ++ dmxdev->filter = NULL; ++ return ret; + } + + EXPORT_SYMBOL(dvb_dmxdev_init); +-- +2.34.1 + diff --git a/queue-4.14/media-dw2102-fix-use-after-free.patch b/queue-4.14/media-dw2102-fix-use-after-free.patch new file mode 100644 index 00000000000..22deefde8ce --- /dev/null +++ b/queue-4.14/media-dw2102-fix-use-after-free.patch @@ -0,0 +1,407 @@ +From 51c4c29e11a4f45f39ce1c75c72ea748ea3f9b0e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2019 12:41:47 +0200 +Subject: media: dw2102: Fix use after free + +From: Anton Vasilyev + +[ Upstream commit 589a9f0eb799f77de2c09583bf5bad221fa5d685 ] + +dvb_usb_device_init stores parts of properties at d->props +and d->desc and uses it on dvb_usb_device_exit. +Free of properties on module probe leads to use after free. +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204597 + +The patch makes properties static instead of allocated on heap to prevent +memleak and use after free. +Also fixes s421_properties.devices initialization to have 2 element +instead of 6 copied from p7500_properties. + +[mchehab: fix function call alignments] +Link: https://lore.kernel.org/linux-media/20190822104147.4420-1-vasilyev@ispras.ru +Signed-off-by: Anton Vasilyev +Fixes: 299c7007e936 ("media: dw2102: Fix memleak on sequence of probes") +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/dvb-usb/dw2102.c | 338 ++++++++++++++++++----------- + 1 file changed, 215 insertions(+), 123 deletions(-) + +diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c +index 3d09e1c879217..98770a95721b9 100644 +--- a/drivers/media/usb/dvb-usb/dw2102.c ++++ b/drivers/media/usb/dvb-usb/dw2102.c +@@ -2103,46 +2103,153 @@ static struct dvb_usb_device_properties s6x0_properties = { + } + }; + +-static const struct dvb_usb_device_description d1100 = { +- "Prof 1100 USB ", +- {&dw2102_table[PROF_1100], NULL}, +- {NULL}, +-}; ++static struct dvb_usb_device_properties p1100_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct dw2102_state), ++ .firmware = P1100_FIRMWARE, ++ .no_reconnect = 1, + +-static const struct dvb_usb_device_description d660 = { +- "TeVii S660 USB", +- {&dw2102_table[TEVII_S660], NULL}, +- {NULL}, +-}; ++ .i2c_algo = &s6x0_i2c_algo, ++ .rc.core = { ++ .rc_interval = 150, ++ .rc_codes = RC_MAP_TBS_NEC, ++ .module_name = "dw2102", ++ .allowed_protos = RC_PROTO_BIT_NEC, ++ .rc_query = prof_rc_query, ++ }, + +-static const struct dvb_usb_device_description d480_1 = { +- "TeVii S480.1 USB", +- {&dw2102_table[TEVII_S480_1], NULL}, +- {NULL}, ++ .generic_bulk_ctrl_endpoint = 0x81, ++ .num_adapters = 1, ++ .download_firmware = dw2102_load_firmware, ++ .read_mac_address = s6x0_read_mac_address, ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .frontend_attach = stv0288_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ }, ++ } }, ++ } ++ }, ++ .num_device_descs = 1, ++ .devices = { ++ {"Prof 1100 USB ", ++ {&dw2102_table[PROF_1100], NULL}, ++ {NULL}, ++ }, ++ } + }; + +-static const struct dvb_usb_device_description d480_2 = { +- "TeVii S480.2 USB", +- {&dw2102_table[TEVII_S480_2], NULL}, +- {NULL}, +-}; ++static struct dvb_usb_device_properties s660_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct dw2102_state), ++ .firmware = S660_FIRMWARE, ++ .no_reconnect = 1, + +-static const struct dvb_usb_device_description d7500 = { +- "Prof 7500 USB DVB-S2", +- {&dw2102_table[PROF_7500], NULL}, +- {NULL}, +-}; ++ .i2c_algo = &s6x0_i2c_algo, ++ .rc.core = { ++ .rc_interval = 150, ++ .rc_codes = RC_MAP_TEVII_NEC, ++ .module_name = "dw2102", ++ .allowed_protos = RC_PROTO_BIT_NEC, ++ .rc_query = dw2102_rc_query, ++ }, + +-static const struct dvb_usb_device_description d421 = { +- "TeVii S421 PCI", +- {&dw2102_table[TEVII_S421], NULL}, +- {NULL}, ++ .generic_bulk_ctrl_endpoint = 0x81, ++ .num_adapters = 1, ++ .download_firmware = dw2102_load_firmware, ++ .read_mac_address = s6x0_read_mac_address, ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .frontend_attach = ds3000_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ }, ++ } }, ++ } ++ }, ++ .num_device_descs = 3, ++ .devices = { ++ {"TeVii S660 USB", ++ {&dw2102_table[TEVII_S660], NULL}, ++ {NULL}, ++ }, ++ {"TeVii S480.1 USB", ++ {&dw2102_table[TEVII_S480_1], NULL}, ++ {NULL}, ++ }, ++ {"TeVii S480.2 USB", ++ {&dw2102_table[TEVII_S480_2], NULL}, ++ {NULL}, ++ }, ++ } + }; + +-static const struct dvb_usb_device_description d632 = { +- "TeVii S632 USB", +- {&dw2102_table[TEVII_S632], NULL}, +- {NULL}, ++static struct dvb_usb_device_properties p7500_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct dw2102_state), ++ .firmware = P7500_FIRMWARE, ++ .no_reconnect = 1, ++ ++ .i2c_algo = &s6x0_i2c_algo, ++ .rc.core = { ++ .rc_interval = 150, ++ .rc_codes = RC_MAP_TBS_NEC, ++ .module_name = "dw2102", ++ .allowed_protos = RC_PROTO_BIT_NEC, ++ .rc_query = prof_rc_query, ++ }, ++ ++ .generic_bulk_ctrl_endpoint = 0x81, ++ .num_adapters = 1, ++ .download_firmware = dw2102_load_firmware, ++ .read_mac_address = s6x0_read_mac_address, ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .frontend_attach = prof_7500_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ }, ++ } }, ++ } ++ }, ++ .num_device_descs = 1, ++ .devices = { ++ {"Prof 7500 USB DVB-S2", ++ {&dw2102_table[PROF_7500], NULL}, ++ {NULL}, ++ }, ++ } + }; + + static struct dvb_usb_device_properties su3000_properties = { +@@ -2214,6 +2321,59 @@ static struct dvb_usb_device_properties su3000_properties = { + } + }; + ++static struct dvb_usb_device_properties s421_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct dw2102_state), ++ .power_ctrl = su3000_power_ctrl, ++ .num_adapters = 1, ++ .identify_state = su3000_identify_state, ++ .i2c_algo = &su3000_i2c_algo, ++ ++ .rc.core = { ++ .rc_interval = 150, ++ .rc_codes = RC_MAP_SU3000, ++ .module_name = "dw2102", ++ .allowed_protos = RC_PROTO_BIT_RC5, ++ .rc_query = su3000_rc_query, ++ }, ++ ++ .read_mac_address = su3000_read_mac_address, ++ ++ .generic_bulk_ctrl_endpoint = 0x01, ++ ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .streaming_ctrl = su3000_streaming_ctrl, ++ .frontend_attach = m88rs2000_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ } ++ } }, ++ } ++ }, ++ .num_device_descs = 2, ++ .devices = { ++ { "TeVii S421 PCI", ++ { &dw2102_table[TEVII_S421], NULL }, ++ { NULL }, ++ }, ++ { "TeVii S632 USB", ++ { &dw2102_table[TEVII_S632], NULL }, ++ { NULL }, ++ }, ++ } ++}; ++ + static struct dvb_usb_device_properties t220_properties = { + .caps = DVB_USB_IS_AN_I2C_ADAPTER, + .usb_ctrl = DEVICE_SPECIFIC, +@@ -2331,101 +2491,33 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { + static int dw2102_probe(struct usb_interface *intf, + const struct usb_device_id *id) + { +- int retval = -ENOMEM; +- struct dvb_usb_device_properties *p1100; +- struct dvb_usb_device_properties *s660; +- struct dvb_usb_device_properties *p7500; +- struct dvb_usb_device_properties *s421; +- +- p1100 = kmemdup(&s6x0_properties, +- sizeof(struct dvb_usb_device_properties), GFP_KERNEL); +- if (!p1100) +- goto err0; +- +- /* copy default structure */ +- /* fill only different fields */ +- p1100->firmware = P1100_FIRMWARE; +- p1100->devices[0] = d1100; +- p1100->rc.core.rc_query = prof_rc_query; +- p1100->rc.core.rc_codes = RC_MAP_TBS_NEC; +- p1100->adapter->fe[0].frontend_attach = stv0288_frontend_attach; +- +- s660 = kmemdup(&s6x0_properties, +- sizeof(struct dvb_usb_device_properties), GFP_KERNEL); +- if (!s660) +- goto err1; +- +- s660->firmware = S660_FIRMWARE; +- s660->num_device_descs = 3; +- s660->devices[0] = d660; +- s660->devices[1] = d480_1; +- s660->devices[2] = d480_2; +- s660->adapter->fe[0].frontend_attach = ds3000_frontend_attach; +- +- p7500 = kmemdup(&s6x0_properties, +- sizeof(struct dvb_usb_device_properties), GFP_KERNEL); +- if (!p7500) +- goto err2; +- +- p7500->firmware = P7500_FIRMWARE; +- p7500->devices[0] = d7500; +- p7500->rc.core.rc_query = prof_rc_query; +- p7500->rc.core.rc_codes = RC_MAP_TBS_NEC; +- p7500->adapter->fe[0].frontend_attach = prof_7500_frontend_attach; +- +- +- s421 = kmemdup(&su3000_properties, +- sizeof(struct dvb_usb_device_properties), GFP_KERNEL); +- if (!s421) +- goto err3; +- +- s421->num_device_descs = 2; +- s421->devices[0] = d421; +- s421->devices[1] = d632; +- s421->adapter->fe[0].frontend_attach = m88rs2000_frontend_attach; +- +- if (0 == dvb_usb_device_init(intf, &dw2102_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &dw2104_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &dw3101_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &s6x0_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, p1100, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, s660, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, p7500, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, s421, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &su3000_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &t220_properties, +- THIS_MODULE, NULL, adapter_nr) || +- 0 == dvb_usb_device_init(intf, &tt_s2_4600_properties, +- THIS_MODULE, NULL, adapter_nr)) { +- +- /* clean up copied properties */ +- kfree(s421); +- kfree(p7500); +- kfree(s660); +- kfree(p1100); ++ if (!(dvb_usb_device_init(intf, &dw2102_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &dw2104_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &dw3101_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &s6x0_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &p1100_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &s660_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &p7500_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &s421_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &su3000_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &t220_properties, ++ THIS_MODULE, NULL, adapter_nr) && ++ dvb_usb_device_init(intf, &tt_s2_4600_properties, ++ THIS_MODULE, NULL, adapter_nr))) { + + return 0; + } + +- retval = -ENODEV; +- kfree(s421); +-err3: +- kfree(p7500); +-err2: +- kfree(s660); +-err1: +- kfree(p1100); +-err0: +- return retval; ++ return -ENODEV; + } + + static void dw2102_disconnect(struct usb_interface *intf) +-- +2.34.1 + diff --git a/queue-4.14/media-em28xx-fix-memory-leak-in-em28xx_init_dev.patch b/queue-4.14/media-em28xx-fix-memory-leak-in-em28xx_init_dev.patch new file mode 100644 index 00000000000..f4a4de67d75 --- /dev/null +++ b/queue-4.14/media-em28xx-fix-memory-leak-in-em28xx_init_dev.patch @@ -0,0 +1,81 @@ +From 9ecdc8b64779349340e0127515c167536d9beb83 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Nov 2021 09:55:39 +0000 +Subject: media: em28xx: fix memory leak in em28xx_init_dev + +From: Dongliang Mu + +[ Upstream commit 22be5a10d0b24eec9e45decd15d7e6112b25f080 ] + +In the em28xx_init_rev, if em28xx_audio_setup fails, this function fails +to deallocate the media_dev allocated in the em28xx_media_device_init. + +Fix this by adding em28xx_unregister_media_device to free media_dev. + +BTW, this patch is tested in my local syzkaller instance, and it can +prevent the memory leak from occurring again. + +CC: Pavel Skripkin +Fixes: 37ecc7b1278f ("[media] em28xx: add media controller support") +Signed-off-by: Dongliang Mu +Reported-by: syzkaller +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/em28xx/em28xx-cards.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c +index 9747e23aad271..b736c027a0bd0 100644 +--- a/drivers/media/usb/em28xx/em28xx-cards.c ++++ b/drivers/media/usb/em28xx/em28xx-cards.c +@@ -3386,8 +3386,10 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, + + if (dev->is_audio_only) { + retval = em28xx_audio_setup(dev); +- if (retval) +- return -ENODEV; ++ if (retval) { ++ retval = -ENODEV; ++ goto err_deinit_media; ++ } + em28xx_init_extension(dev); + + return 0; +@@ -3417,7 +3419,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, + dev_err(&dev->intf->dev, + "%s: em28xx_i2c_register bus 0 - error [%d]!\n", + __func__, retval); +- return retval; ++ goto err_deinit_media; + } + + /* register i2c bus 1 */ +@@ -3433,9 +3435,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, + "%s: em28xx_i2c_register bus 1 - error [%d]!\n", + __func__, retval); + +- em28xx_i2c_unregister(dev, 0); +- +- return retval; ++ goto err_unreg_i2c; + } + } + +@@ -3443,6 +3443,12 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev, + em28xx_card_setup(dev); + + return 0; ++ ++err_unreg_i2c: ++ em28xx_i2c_unregister(dev, 0); ++err_deinit_media: ++ em28xx_unregister_media_device(dev); ++ return retval; + } + + /* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */ +-- +2.34.1 + diff --git a/queue-4.14/media-igorplugusb-receiver-overflow-should-be-report.patch b/queue-4.14/media-igorplugusb-receiver-overflow-should-be-report.patch new file mode 100644 index 00000000000..ca851146e43 --- /dev/null +++ b/queue-4.14/media-igorplugusb-receiver-overflow-should-be-report.patch @@ -0,0 +1,39 @@ +From f00272917f164309fa18f32471f738cb3779a3bc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Nov 2021 23:58:19 +0100 +Subject: media: igorplugusb: receiver overflow should be reported + +From: Sean Young + +[ Upstream commit 8fede658e7ddb605bbd68ed38067ddb0af033db4 ] + +Without this, some IR will be missing mid-stream and we might decode +something which never really occurred. + +Signed-off-by: Sean Young +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/rc/igorplugusb.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c +index a5ea86be8f449..2a0325d1f9def 100644 +--- a/drivers/media/rc/igorplugusb.c ++++ b/drivers/media/rc/igorplugusb.c +@@ -73,9 +73,11 @@ static void igorplugusb_irdata(struct igorplugusb *ir, unsigned len) + if (start >= len) { + dev_err(ir->dev, "receive overflow invalid: %u", overflow); + } else { +- if (overflow > 0) ++ if (overflow > 0) { + dev_warn(ir->dev, "receive overflow, at least %u lost", + overflow); ++ ir_raw_event_reset(ir->rc); ++ } + + do { + rawir.duration = ir->buf_in[i] * 85333; +-- +2.34.1 + diff --git a/queue-4.14/media-m920x-don-t-use-stack-on-usb-reads.patch b/queue-4.14/media-m920x-don-t-use-stack-on-usb-reads.patch new file mode 100644 index 00000000000..0d592e3b88e --- /dev/null +++ b/queue-4.14/media-m920x-don-t-use-stack-on-usb-reads.patch @@ -0,0 +1,59 @@ +From c4be8f6cc567c565d39b57ddf55a7b6053e371b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Dec 2021 15:34:19 +0100 +Subject: media: m920x: don't use stack on USB reads + +From: Mauro Carvalho Chehab + +[ Upstream commit a2ab06d7c4d6bfd0b545a768247a70463e977e27 ] + +Using stack-allocated pointers for USB message data don't work. +This driver is almost OK with that, except for the I2C read +logic. + +Fix it by using a temporary read buffer, just like on all other +calls to m920x_read(). + +Link: https://lore.kernel.org/all/ccc99e48-de4f-045e-0fe4-61e3118e3f74@mida.se/ +Reported-by: rkardell@mida.se +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/dvb-usb/m920x.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/usb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c +index 32081c2ce0da8..8a43e2415686a 100644 +--- a/drivers/media/usb/dvb-usb/m920x.c ++++ b/drivers/media/usb/dvb-usb/m920x.c +@@ -280,6 +280,13 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu + /* Should check for ack here, if we knew how. */ + } + if (msg[i].flags & I2C_M_RD) { ++ char *read = kmalloc(1, GFP_KERNEL); ++ if (!read) { ++ ret = -ENOMEM; ++ kfree(read); ++ goto unlock; ++ } ++ + for (j = 0; j < msg[i].len; j++) { + /* Last byte of transaction? + * Send STOP, otherwise send ACK. */ +@@ -287,9 +294,12 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu + + if ((ret = m920x_read(d->udev, M9206_I2C, 0x0, + 0x20 | stop, +- &msg[i].buf[j], 1)) != 0) ++ read, 1)) != 0) + goto unlock; ++ msg[i].buf[j] = read[0]; + } ++ ++ kfree(read); + } else { + for (j = 0; j < msg[i].len; j++) { + /* Last byte of transaction? Then send STOP. */ +-- +2.34.1 + diff --git a/queue-4.14/media-msi001-fix-possible-null-ptr-deref-in-msi001_p.patch b/queue-4.14/media-msi001-fix-possible-null-ptr-deref-in-msi001_p.patch new file mode 100644 index 00000000000..f6f255369b6 --- /dev/null +++ b/queue-4.14/media-msi001-fix-possible-null-ptr-deref-in-msi001_p.patch @@ -0,0 +1,58 @@ +From 652e7abb2cd65a7b73cb7c5b5b3458002d17ee03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Oct 2021 13:23:48 +0200 +Subject: media: msi001: fix possible null-ptr-deref in msi001_probe() + +From: Wang Hai + +[ Upstream commit 3d5831a40d3464eea158180eb12cbd81c5edfb6a ] + +I got a null-ptr-deref report: + +BUG: kernel NULL pointer dereference, address: 0000000000000060 +... +RIP: 0010:v4l2_ctrl_auto_cluster+0x57/0x270 +... +Call Trace: + msi001_probe+0x13b/0x24b [msi001] + spi_probe+0xeb/0x130 +... + do_syscall_64+0x35/0xb0 + +In msi001_probe(), if the creation of control for bandwidth_auto +fails, there will be a null-ptr-deref issue when it is used in +v4l2_ctrl_auto_cluster(). + +Check dev->hdl.error before v4l2_ctrl_auto_cluster() to fix this bug. + +Link: https://lore.kernel.org/linux-media/20211026112348.2878040-1-wanghai38@huawei.com +Fixes: 93203dd6c7c4 ("[media] msi001: Mirics MSi001 silicon tuner driver") +Reported-by: Hulk Robot +Signed-off-by: Wang Hai +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/tuners/msi001.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c +index 3a12ef35682b5..64d98517f470f 100644 +--- a/drivers/media/tuners/msi001.c ++++ b/drivers/media/tuners/msi001.c +@@ -464,6 +464,13 @@ static int msi001_probe(struct spi_device *spi) + V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1); + dev->bandwidth = v4l2_ctrl_new_std(&dev->hdl, &msi001_ctrl_ops, + V4L2_CID_RF_TUNER_BANDWIDTH, 200000, 8000000, 1, 200000); ++ if (dev->hdl.error) { ++ ret = dev->hdl.error; ++ dev_err(&spi->dev, "Could not initialize controls\n"); ++ /* control init failed, free handler */ ++ goto err_ctrl_handler_free; ++ } ++ + v4l2_ctrl_auto_cluster(2, &dev->bandwidth_auto, 0, false); + dev->lna_gain = v4l2_ctrl_new_std(&dev->hdl, &msi001_ctrl_ops, + V4L2_CID_RF_TUNER_LNA_GAIN, 0, 1, 1, 1); +-- +2.34.1 + diff --git a/queue-4.14/media-mtk-vcodec-call-v4l2_m2m_ctx_release-first-whe.patch b/queue-4.14/media-mtk-vcodec-call-v4l2_m2m_ctx_release-first-whe.patch new file mode 100644 index 00000000000..7b671594176 --- /dev/null +++ b/queue-4.14/media-mtk-vcodec-call-v4l2_m2m_ctx_release-first-whe.patch @@ -0,0 +1,86 @@ +From 7c8e1e3654f8beeef2aaca0d371daa893b39f16f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 17 Nov 2021 14:06:30 +0100 +Subject: media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is + released + +From: Dafna Hirschfeld + +[ Upstream commit 9f89c881bffbdffe4060ffaef3489a2830a6dd9c ] + +The func v4l2_m2m_ctx_release waits for currently running jobs +to finish and then stop streaming both queues and frees the buffers. +All this should be done before the call to mtk_vcodec_enc_release +which frees the encoder handler. This fixes null-pointer dereference bug: + +[ 638.028076] Mem abort info: +[ 638.030932] ESR = 0x96000004 +[ 638.033978] EC = 0x25: DABT (current EL), IL = 32 bits +[ 638.039293] SET = 0, FnV = 0 +[ 638.042338] EA = 0, S1PTW = 0 +[ 638.045474] FSC = 0x04: level 0 translation fault +[ 638.050349] Data abort info: +[ 638.053224] ISV = 0, ISS = 0x00000004 +[ 638.057055] CM = 0, WnR = 0 +[ 638.060018] user pgtable: 4k pages, 48-bit VAs, pgdp=000000012b6db000 +[ 638.066485] [00000000000001a0] pgd=0000000000000000, p4d=0000000000000000 +[ 638.073277] Internal error: Oops: 96000004 [#1] SMP +[ 638.078145] Modules linked in: rfkill mtk_vcodec_dec mtk_vcodec_enc uvcvideo mtk_mdp mtk_vcodec_common videobuf2_dma_contig v4l2_h264 cdc_ether v4l2_mem2mem videobuf2_vmalloc usbnet videobuf2_memops videobuf2_v4l2 r8152 videobuf2_common videodev cros_ec_sensors cros_ec_sensors_core industrialio_triggered_buffer kfifo_buf elan_i2c elants_i2c sbs_battery mc cros_usbpd_charger cros_ec_chardev cros_usbpd_logger crct10dif_ce mtk_vpu fuse ip_tables x_tables ipv6 +[ 638.118583] CPU: 0 PID: 212 Comm: kworker/u8:5 Not tainted 5.15.0-06427-g58a1d4dcfc74-dirty #109 +[ 638.127357] Hardware name: Google Elm (DT) +[ 638.131444] Workqueue: mtk-vcodec-enc mtk_venc_worker [mtk_vcodec_enc] +[ 638.137974] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 638.144925] pc : vp8_enc_encode+0x34/0x2b0 [mtk_vcodec_enc] +[ 638.150493] lr : venc_if_encode+0xac/0x1b0 [mtk_vcodec_enc] +[ 638.156060] sp : ffff8000124d3c40 +[ 638.159364] x29: ffff8000124d3c40 x28: 0000000000000000 x27: 0000000000000000 +[ 638.166493] x26: 0000000000000000 x25: ffff0000e7f252d0 x24: ffff8000124d3d58 +[ 638.173621] x23: ffff8000124d3d58 x22: ffff8000124d3d60 x21: 0000000000000001 +[ 638.180750] x20: ffff80001137e000 x19: 0000000000000000 x18: 0000000000000001 +[ 638.187878] x17: 000000040044ffff x16: 00400032b5503510 x15: 0000000000000000 +[ 638.195006] x14: ffff8000118536c0 x13: ffff8000ee1da000 x12: 0000000030d4d91d +[ 638.202134] x11: 0000000000000000 x10: 0000000000000980 x9 : ffff8000124d3b20 +[ 638.209262] x8 : ffff0000c18d4ea0 x7 : ffff0000c18d44c0 x6 : ffff0000c18d44c0 +[ 638.216391] x5 : ffff80000904a3b0 x4 : ffff8000124d3d58 x3 : ffff8000124d3d60 +[ 638.223519] x2 : ffff8000124d3d78 x1 : 0000000000000001 x0 : ffff80001137efb8 +[ 638.230648] Call trace: +[ 638.233084] vp8_enc_encode+0x34/0x2b0 [mtk_vcodec_enc] +[ 638.238304] venc_if_encode+0xac/0x1b0 [mtk_vcodec_enc] +[ 638.243525] mtk_venc_worker+0x110/0x250 [mtk_vcodec_enc] +[ 638.248918] process_one_work+0x1f8/0x498 +[ 638.252923] worker_thread+0x140/0x538 +[ 638.256664] kthread+0x148/0x158 +[ 638.259884] ret_from_fork+0x10/0x20 +[ 638.263455] Code: f90023f9 2a0103f5 aa0303f6 aa0403f8 (f940d277) +[ 638.269538] ---[ end trace e374fc10f8e181f5 ]--- + +[gst-master] root@debian:~/gst-build# [ 638.019193] Unable to handle kernel NULL pointer dereference at virtual address 00000000000001a0 +Fixes: 4e855a6efa547 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") +Signed-off-by: Dafna Hirschfeld +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +index 83f859e8509c9..b95006a864c26 100644 +--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c ++++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +@@ -217,11 +217,11 @@ static int fops_vcodec_release(struct file *file) + mtk_v4l2_debug(1, "[%d] encoder", ctx->id); + mutex_lock(&dev->dev_mutex); + ++ v4l2_m2m_ctx_release(ctx->m2m_ctx); + mtk_vcodec_enc_release(ctx); + v4l2_fh_del(&ctx->fh); + v4l2_fh_exit(&ctx->fh); + v4l2_ctrl_handler_free(&ctx->ctrl_hdl); +- v4l2_m2m_ctx_release(ctx->m2m_ctx); + + list_del_init(&ctx->list); + kfree(ctx); +-- +2.34.1 + diff --git a/queue-4.14/media-saa7146-hexium_gemini-fix-a-null-pointer-deref.patch b/queue-4.14/media-saa7146-hexium_gemini-fix-a-null-pointer-deref.patch new file mode 100644 index 00000000000..8c6eda5cfc0 --- /dev/null +++ b/queue-4.14/media-saa7146-hexium_gemini-fix-a-null-pointer-deref.patch @@ -0,0 +1,74 @@ +From deb9d2cc32e1e07ece228217b387d85a2a2d5bdc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 16:40:30 +0100 +Subject: media: saa7146: hexium_gemini: Fix a NULL pointer dereference in + hexium_attach() + +From: Zhou Qingyang + +[ Upstream commit 3af86b046933ba513d08399dba0d4d8b50d607d0 ] + +In hexium_attach(dev, info), saa7146_vv_init() is called to allocate +a new memory for dev->vv_data. saa7146_vv_release() will be called on +failure of saa7146_register_device(). There is a dereference of +dev->vv_data in saa7146_vv_release(), which could lead to a NULL +pointer dereference on failure of saa7146_vv_init(). + +Fix this bug by adding a check of saa7146_vv_init(). + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_VIDEO_HEXIUM_GEMINI=m show no new warnings, +and our static analyzer no longer warns about this code. + +Link: https://lore.kernel.org/linux-media/20211203154030.111210-1-zhou1615@umn.edu +Signed-off-by: Zhou Qingyang +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/common/saa7146/saa7146_fops.c | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 7 ++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c +index 930d2c94d5d30..2c9365a39270a 100644 +--- a/drivers/media/common/saa7146/saa7146_fops.c ++++ b/drivers/media/common/saa7146/saa7146_fops.c +@@ -524,7 +524,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) + ERR("out of memory. aborting.\n"); + kfree(vv); + v4l2_ctrl_handler_free(hdl); +- return -1; ++ return -ENOMEM; + } + + saa7146_video_uops.init(dev,vv); +diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c +index a527d86b93a77..7f498aebb4112 100644 +--- a/drivers/media/pci/saa7146/hexium_gemini.c ++++ b/drivers/media/pci/saa7146/hexium_gemini.c +@@ -296,7 +296,12 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d + hexium_set_input(hexium, 0); + hexium->cur_input = 0; + +- saa7146_vv_init(dev, &vv_data); ++ ret = saa7146_vv_init(dev, &vv_data); ++ if (ret) { ++ i2c_del_adapter(&hexium->i2c_adapter); ++ kfree(hexium); ++ return ret; ++ } + + vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input; + vv_data.vid_ops.vidioc_g_input = vidioc_g_input; +-- +2.34.1 + diff --git a/queue-4.14/media-saa7146-hexium_orion-fix-a-null-pointer-derefe.patch b/queue-4.14/media-saa7146-hexium_orion-fix-a-null-pointer-derefe.patch new file mode 100644 index 00000000000..626df8df18d --- /dev/null +++ b/queue-4.14/media-saa7146-hexium_orion-fix-a-null-pointer-derefe.patch @@ -0,0 +1,74 @@ +From cf0709ae7c7395b61b0e51a74c8c0be6219cf3fa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Nov 2021 17:25:49 +0100 +Subject: media: saa7146: hexium_orion: Fix a NULL pointer dereference in + hexium_attach() + +From: Zhou Qingyang + +[ Upstream commit 348df8035301dd212e3cc2860efe4c86cb0d3303 ] + +In hexium_attach(dev, info), saa7146_vv_init() is called to allocate +a new memory for dev->vv_data. In hexium_detach(), saa7146_vv_release() +will be called and there is a dereference of dev->vv_data in +saa7146_vv_release(), which could lead to a NULL pointer dereference +on failure of saa7146_vv_init() according to the following logic. + +Both hexium_attach() and hexium_detach() are callback functions of +the variable 'extension', so there exists a possible call chain directly +from hexium_attach() to hexium_detach(): + +hexium_attach(dev, info) -- fail to alloc memory to dev->vv_data + | in saa7146_vv_init(). + | + | +hexium_detach() -- a dereference of dev->vv_data in saa7146_vv_release() + +Fix this bug by adding a check of saa7146_vv_init(). + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_VIDEO_HEXIUM_ORION=m show no new warnings, +and our static analyzer no longer warns about this code. + +Signed-off-by: Zhou Qingyang +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/pci/saa7146/hexium_orion.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/pci/saa7146/hexium_orion.c b/drivers/media/pci/saa7146/hexium_orion.c +index cb71653a66694..908de2f768441 100644 +--- a/drivers/media/pci/saa7146/hexium_orion.c ++++ b/drivers/media/pci/saa7146/hexium_orion.c +@@ -366,10 +366,16 @@ static struct saa7146_ext_vv vv_data; + static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info) + { + struct hexium *hexium = (struct hexium *) dev->ext_priv; ++ int ret; + + DEB_EE("\n"); + +- saa7146_vv_init(dev, &vv_data); ++ ret = saa7146_vv_init(dev, &vv_data); ++ if (ret) { ++ pr_err("Error in saa7146_vv_init()\n"); ++ return ret; ++ } ++ + vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input; + vv_data.vid_ops.vidioc_g_input = vidioc_g_input; + vv_data.vid_ops.vidioc_s_input = vidioc_s_input; +-- +2.34.1 + diff --git a/queue-4.14/media-saa7146-mxb-fix-a-null-pointer-dereference-in-.patch b/queue-4.14/media-saa7146-mxb-fix-a-null-pointer-dereference-in-.patch new file mode 100644 index 00000000000..e96f9c23f81 --- /dev/null +++ b/queue-4.14/media-saa7146-mxb-fix-a-null-pointer-dereference-in-.patch @@ -0,0 +1,64 @@ +From 0f48afb6b55328ec4fa23976b3bf69a9e4f71bdd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Nov 2021 17:34:44 +0100 +Subject: media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach() + +From: Zhou Qingyang + +[ Upstream commit 0407c49ebe330333478440157c640fffd986f41b ] + +In mxb_attach(dev, info), saa7146_vv_init() is called to allocate a +new memory for dev->vv_data. saa7146_vv_release() will be called on +failure of mxb_probe(dev). There is a dereference of dev->vv_data +in saa7146_vv_release(), which could lead to a NULL pointer dereference +on failure of saa7146_vv_init(). + +Fix this bug by adding a check of saa7146_vv_init(). + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_VIDEO_MXB=m show no new warnings, +and our static analyzer no longer warns about this code. + +Fixes: 03b1930efd3c ("V4L/DVB: saa7146: fix regression of the av7110/budget-av driver") +Signed-off-by: Zhou Qingyang +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/pci/saa7146/mxb.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c +index 2e7bd82282caa..b2260deab94cc 100644 +--- a/drivers/media/pci/saa7146/mxb.c ++++ b/drivers/media/pci/saa7146/mxb.c +@@ -694,10 +694,16 @@ static struct saa7146_ext_vv vv_data; + static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info) + { + struct mxb *mxb; ++ int ret; + + DEB_EE("dev:%p\n", dev); + +- saa7146_vv_init(dev, &vv_data); ++ ret = saa7146_vv_init(dev, &vv_data); ++ if (ret) { ++ ERR("Error in saa7146_vv_init()"); ++ return ret; ++ } ++ + if (mxb_probe(dev)) { + saa7146_vv_release(dev); + return -1; +-- +2.34.1 + diff --git a/queue-4.14/media-si2157-fix-warm-tuner-state-detection.patch b/queue-4.14/media-si2157-fix-warm-tuner-state-detection.patch new file mode 100644 index 00000000000..4622a66a4c6 --- /dev/null +++ b/queue-4.14/media-si2157-fix-warm-tuner-state-detection.patch @@ -0,0 +1,61 @@ +From e310842a89ee38765cc3872f8240fd84fb7fdef5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 22:08:43 +0100 +Subject: media: si2157: Fix "warm" tuner state detection + +From: Robert Schlabbach + +[ Upstream commit a6441ea29cb2c9314654e093a1cd8020b9b851c8 ] + +Commit e955f959ac52 ("media: si2157: Better check for running tuner in +init") completely broke the "warm" tuner detection of the si2157 driver +due to a simple endian error: The Si2157 CRYSTAL_TRIM property code is +0x0402 and needs to be transmitted LSB first. However, it was inserted +MSB first, causing the warm detection to always fail and spam the kernel +log with tuner initialization messages each time the DVB frontend +device was closed and reopened: + +[ 312.215682] si2157 16-0060: found a 'Silicon Labs Si2157-A30' +[ 312.264334] si2157 16-0060: firmware version: 3.0.5 +[ 342.248593] si2157 16-0060: found a 'Silicon Labs Si2157-A30' +[ 342.295743] si2157 16-0060: firmware version: 3.0.5 +[ 372.328574] si2157 16-0060: found a 'Silicon Labs Si2157-A30' +[ 372.385035] si2157 16-0060: firmware version: 3.0.5 + +Also, the reinitializations were observed disturb _other_ tuners on +multi-tuner cards such as the Hauppauge WinTV-QuadHD, leading to missed +or errored packets when one of the other DVB frontend devices on that +card was opened. + +Fix the order of the property code bytes to make the warm detection work +again, also reducing the tuner initialization message in the kernel log +to once per power-on, as well as fixing the interference with other +tuners. + +Link: https://lore.kernel.org/linux-media/trinity-2a86eb9d-6264-4387-95e1-ba7b79a4050f-1638392923493@3c-app-gmx-bap03 + +Fixes: e955f959ac52 ("media: si2157: Better check for running tuner in init") +Reported-by: Robert Schlabbach +Signed-off-by: Robert Schlabbach +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/tuners/si2157.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c +index c826997f54330..229fea019e99e 100644 +--- a/drivers/media/tuners/si2157.c ++++ b/drivers/media/tuners/si2157.c +@@ -89,7 +89,7 @@ static int si2157_init(struct dvb_frontend *fe) + dev_dbg(&client->dev, "\n"); + + /* Try to get Xtal trim property, to verify tuner still running */ +- memcpy(cmd.args, "\x15\x00\x04\x02", 4); ++ memcpy(cmd.args, "\x15\x00\x02\x04", 4); + cmd.wlen = 4; + cmd.rlen = 4; + ret = si2157_cmd_execute(client, &cmd); +-- +2.34.1 + diff --git a/queue-4.14/media-uvcvideo-increase-uvc_ctrl_control_timeout-to-.patch b/queue-4.14/media-uvcvideo-increase-uvc_ctrl_control_timeout-to-.patch new file mode 100644 index 00000000000..84812e19702 --- /dev/null +++ b/queue-4.14/media-uvcvideo-increase-uvc_ctrl_control_timeout-to-.patch @@ -0,0 +1,45 @@ +From 2fbc444ec32228bc1ee3deb9b50dc88f0dfd5a58 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Nov 2021 09:52:36 +0100 +Subject: media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds. + +From: James Hilliard + +[ Upstream commit c8ed7d2f614cd8b315981d116c7a2fb01829500d ] + +Some uvc devices appear to require the maximum allowed USB timeout +for GET_CUR/SET_CUR requests. + +So lets just bump the UVC control timeout to 5 seconds which is the +same as the usb ctrl get/set defaults: +USB_CTRL_GET_TIMEOUT 5000 +USB_CTRL_SET_TIMEOUT 5000 + +It fixes the following runtime warnings: + Failed to query (GET_CUR) UVC control 11 on unit 2: -110 (exp. 1). + Failed to query (SET_CUR) UVC control 3 on unit 2: -110 (exp. 2). + +Signed-off-by: James Hilliard +Signed-off-by: Laurent Pinchart +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvcvideo.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h +index 05398784d1c89..acb9f95127eb2 100644 +--- a/drivers/media/usb/uvc/uvcvideo.h ++++ b/drivers/media/usb/uvc/uvcvideo.h +@@ -167,7 +167,7 @@ + /* Maximum status buffer size in bytes of interrupt URB. */ + #define UVC_MAX_STATUS_SIZE 16 + +-#define UVC_CTRL_CONTROL_TIMEOUT 500 ++#define UVC_CTRL_CONTROL_TIMEOUT 5000 + #define UVC_CTRL_STREAMING_TIMEOUT 5000 + + /* Maximum allowed number of control mappings per device */ +-- +2.34.1 + diff --git a/queue-4.14/mips-bcm63xx-add-support-for-clk_set_parent.patch b/queue-4.14/mips-bcm63xx-add-support-for-clk_set_parent.patch new file mode 100644 index 00000000000..809b774bb9b --- /dev/null +++ b/queue-4.14/mips-bcm63xx-add-support-for-clk_set_parent.patch @@ -0,0 +1,48 @@ +From f64b63caa9c572edf198275224c4fb607a91d318 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Dec 2021 16:05:53 -0800 +Subject: mips: bcm63xx: add support for clk_set_parent() + +From: Randy Dunlap + +[ Upstream commit 6f03055d508ff4feb8db02ba3df9303a1db8d381 ] + +The MIPS BMC63XX subarch does not provide/support clk_set_parent(). +This causes build errors in a few drivers, so add a simple implementation +of that function so that callers of it will build without errors. + +Fixes these build errors: + +ERROR: modpost: "clk_set_parent" [sound/soc/jz4740/snd-soc-jz4740-i2s.ko] undefined! +ERROR: modpost: "clk_set_parent" [sound/soc/atmel/snd-soc-atmel-i2s.ko] undefined! + +Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs." ) +Signed-off-by: Randy Dunlap +Reviewed-by: Jonathan Cameron +Acked-by: Florian Fainelli +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/bcm63xx/clk.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c +index d2a5054b0492b..73f2534b9676d 100644 +--- a/arch/mips/bcm63xx/clk.c ++++ b/arch/mips/bcm63xx/clk.c +@@ -343,6 +343,12 @@ struct clk *clk_get_parent(struct clk *clk) + } + EXPORT_SYMBOL(clk_get_parent); + ++int clk_set_parent(struct clk *clk, struct clk *parent) ++{ ++ return 0; ++} ++EXPORT_SYMBOL(clk_set_parent); ++ + unsigned long clk_get_rate(struct clk *clk) + { + if (!clk) +-- +2.34.1 + diff --git a/queue-4.14/mips-lantiq-add-support-for-clk_set_parent.patch b/queue-4.14/mips-lantiq-add-support-for-clk_set_parent.patch new file mode 100644 index 00000000000..b84913c8d6c --- /dev/null +++ b/queue-4.14/mips-lantiq-add-support-for-clk_set_parent.patch @@ -0,0 +1,48 @@ +From 965ce32d03796d0ebe5cd79d8251bae1fbf60997 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Dec 2021 16:03:45 -0800 +Subject: mips: lantiq: add support for clk_set_parent() + +From: Randy Dunlap + +[ Upstream commit 76f66dfd60dc5d2f9dec22d99091fea1035c5d03 ] + +Provide a simple implementation of clk_set_parent() in the lantiq +subarch so that callers of it will build without errors. + +Fixes these build errors: + +ERROR: modpost: "clk_set_parent" [sound/soc/jz4740/snd-soc-jz4740-i2s.ko] undefined! +ERROR: modpost: "clk_set_parent" [sound/soc/atmel/snd-soc-atmel-i2s.ko] undefined! + +Fixes: 171bb2f19ed6 ("MIPS: Lantiq: Add initial support for Lantiq SoCs") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +--to=linux-mips@vger.kernel.org --cc="John Crispin " --cc="Jonathan Cameron " --cc="Russell King " --cc="Andy Shevchenko " --cc=alsa-devel@alsa-project.org --to="Thomas Bogendoerfer " +Reviewed-by: Jonathan Cameron +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/lantiq/clk.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c +index a8e309dcd38d7..f5fab99d1751c 100644 +--- a/arch/mips/lantiq/clk.c ++++ b/arch/mips/lantiq/clk.c +@@ -166,6 +166,12 @@ struct clk *clk_get_parent(struct clk *clk) + } + EXPORT_SYMBOL(clk_get_parent); + ++int clk_set_parent(struct clk *clk, struct clk *parent) ++{ ++ return 0; ++} ++EXPORT_SYMBOL(clk_set_parent); ++ + static inline u32 get_counter_resolution(void) + { + u32 res; +-- +2.34.1 + diff --git a/queue-4.14/mips-octeon-add-put_device-after-of_find_device_by_n.patch b/queue-4.14/mips-octeon-add-put_device-after-of_find_device_by_n.patch new file mode 100644 index 00000000000..4df45607127 --- /dev/null +++ b/queue-4.14/mips-octeon-add-put_device-after-of_find_device_by_n.patch @@ -0,0 +1,67 @@ +From a0ee36e49047b98670b3fe84c31e8e47bc593104 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Nov 2021 08:10:51 +0000 +Subject: MIPS: OCTEON: add put_device() after of_find_device_by_node() + +From: Ye Guojin + +[ Upstream commit 858779df1c0787d3fec827fb705708df9ebdb15b ] + +This was found by coccicheck: +./arch/mips/cavium-octeon/octeon-platform.c, 332, 1-7, ERROR missing +put_device; call of_find_device_by_node on line 324, but without a +corresponding object release within this function. +./arch/mips/cavium-octeon/octeon-platform.c, 395, 1-7, ERROR missing +put_device; call of_find_device_by_node on line 387, but without a +corresponding object release within this function. +./arch/mips/cavium-octeon/octeon-usb.c, 512, 3-9, ERROR missing +put_device; call of_find_device_by_node on line 515, but without a +corresponding object release within this function. +./arch/mips/cavium-octeon/octeon-usb.c, 543, 1-7, ERROR missing +put_device; call of_find_device_by_node on line 515, but without a +corresponding object release within this function. + +Reported-by: Zeal Robot +Signed-off-by: Ye Guojin +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/cavium-octeon/octeon-platform.c | 2 ++ + arch/mips/cavium-octeon/octeon-usb.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c +index e1e24118c169e..ed42fc27033c4 100644 +--- a/arch/mips/cavium-octeon/octeon-platform.c ++++ b/arch/mips/cavium-octeon/octeon-platform.c +@@ -328,6 +328,7 @@ static int __init octeon_ehci_device_init(void) + + pd->dev.platform_data = &octeon_ehci_pdata; + octeon_ehci_hw_start(&pd->dev); ++ put_device(&pd->dev); + + return ret; + } +@@ -391,6 +392,7 @@ static int __init octeon_ohci_device_init(void) + + pd->dev.platform_data = &octeon_ohci_pdata; + octeon_ohci_hw_start(&pd->dev); ++ put_device(&pd->dev); + + return ret; + } +diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c +index 75189ff2f3c78..3465452e28195 100644 +--- a/arch/mips/cavium-octeon/octeon-usb.c ++++ b/arch/mips/cavium-octeon/octeon-usb.c +@@ -543,6 +543,7 @@ static int __init dwc3_octeon_device_init(void) + devm_iounmap(&pdev->dev, base); + devm_release_mem_region(&pdev->dev, res->start, + resource_size(res)); ++ put_device(&pdev->dev); + } + } while (node != NULL); + +-- +2.34.1 + diff --git a/queue-4.14/mips-octeon-fix-build-errors-using-clang.patch b/queue-4.14/mips-octeon-fix-build-errors-using-clang.patch new file mode 100644 index 00000000000..f3d1688d00c --- /dev/null +++ b/queue-4.14/mips-octeon-fix-build-errors-using-clang.patch @@ -0,0 +1,62 @@ +From 342104493427ec075798db378d98cd92a38d2343 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 16 Dec 2021 17:50:14 +0800 +Subject: MIPS: Octeon: Fix build errors using clang +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Tianjia Zhang + +[ Upstream commit 95339b70677dc6f9a2d669c4716058e71b8dc1c7 ] + +A large number of the following errors is reported when compiling +with clang: + + cvmx-bootinfo.h:326:3: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int] + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NULL) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cvmx-bootinfo.h:321:20: note: expanded from macro 'ENUM_BRD_TYPE_CASE' + case x: return(#x + 16); /* Skip CVMX_BOARD_TYPE_ */ + ~~~^~~~ + cvmx-bootinfo.h:326:3: note: use array indexing to silence this warning + cvmx-bootinfo.h:321:20: note: expanded from macro 'ENUM_BRD_TYPE_CASE' + case x: return(#x + 16); /* Skip CVMX_BOARD_TYPE_ */ + ^ + +Follow the prompts to use the address operator '&' to fix this error. + +Signed-off-by: Tianjia Zhang +Reviewed-by: Nathan Chancellor +Reviewed-by: Philippe Mathieu-Daudé +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h +index 62787765575ef..ce6e5fddce0bf 100644 +--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h ++++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h +@@ -315,7 +315,7 @@ enum cvmx_chip_types_enum { + + /* Functions to return string based on type */ + #define ENUM_BRD_TYPE_CASE(x) \ +- case x: return(#x + 16); /* Skip CVMX_BOARD_TYPE_ */ ++ case x: return (&#x[16]); /* Skip CVMX_BOARD_TYPE_ */ + static inline const char *cvmx_board_type_to_string(enum + cvmx_board_types_enum type) + { +@@ -404,7 +404,7 @@ static inline const char *cvmx_board_type_to_string(enum + } + + #define ENUM_CHIP_TYPE_CASE(x) \ +- case x: return(#x + 15); /* Skip CVMX_CHIP_TYPE */ ++ case x: return (&#x[15]); /* Skip CVMX_CHIP_TYPE */ + static inline const char *cvmx_chip_type_to_string(enum + cvmx_chip_types_enum type) + { +-- +2.34.1 + diff --git a/queue-4.14/misc-lattice-ecp3-config-fix-task-hung-when-firmware.patch b/queue-4.14/misc-lattice-ecp3-config-fix-task-hung-when-firmware.patch new file mode 100644 index 00000000000..5054d25c684 --- /dev/null +++ b/queue-4.14/misc-lattice-ecp3-config-fix-task-hung-when-firmware.patch @@ -0,0 +1,95 @@ +From 8000f892868ffbd82a80c93c57b376621b2f1029 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Dec 2021 12:55:22 +0000 +Subject: misc: lattice-ecp3-config: Fix task hung when firmware load failed + +From: Wei Yongjun + +[ Upstream commit fcee5ce50bdb21116711e38635e3865594af907e ] + +When firmware load failed, kernel report task hung as follows: + +INFO: task xrun:5191 blocked for more than 147 seconds. + Tainted: G W 5.16.0-rc5-next-20211220+ #11 +"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +task:xrun state:D stack: 0 pid: 5191 ppid: 270 flags:0x00000004 +Call Trace: + __schedule+0xc12/0x4b50 kernel/sched/core.c:4986 + schedule+0xd7/0x260 kernel/sched/core.c:6369 (discriminator 1) + schedule_timeout+0x7aa/0xa80 kernel/time/timer.c:1857 + wait_for_completion+0x181/0x290 kernel/sched/completion.c:85 + lattice_ecp3_remove+0x32/0x40 drivers/misc/lattice-ecp3-config.c:221 + spi_remove+0x72/0xb0 drivers/spi/spi.c:409 + +lattice_ecp3_remove() wait for signals from firmware loading, but when +load failed, firmware_load() does not send this signal. This cause +device remove hung. Fix it by sending signal even if load failed. + +Fixes: 781551df57c7 ("misc: Add Lattice ECP3 FPGA configuration via SPI") +Reported-by: Hulk Robot +Signed-off-by: Wei Yongjun +Link: https://lore.kernel.org/r/20211228125522.3122284-1-weiyongjun1@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/misc/lattice-ecp3-config.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c +index 626fdcaf25101..645d26536114f 100644 +--- a/drivers/misc/lattice-ecp3-config.c ++++ b/drivers/misc/lattice-ecp3-config.c +@@ -81,12 +81,12 @@ static void firmware_load(const struct firmware *fw, void *context) + + if (fw == NULL) { + dev_err(&spi->dev, "Cannot load firmware, aborting\n"); +- return; ++ goto out; + } + + if (fw->size == 0) { + dev_err(&spi->dev, "Error: Firmware size is 0!\n"); +- return; ++ goto out; + } + + /* Fill dummy data (24 stuffing bits for commands) */ +@@ -108,7 +108,7 @@ static void firmware_load(const struct firmware *fw, void *context) + dev_err(&spi->dev, + "Error: No supported FPGA detected (JEDEC_ID=%08x)!\n", + jedec_id); +- return; ++ goto out; + } + + dev_info(&spi->dev, "FPGA %s detected\n", ecp3_dev[i].name); +@@ -121,7 +121,7 @@ static void firmware_load(const struct firmware *fw, void *context) + buffer = kzalloc(fw->size + 8, GFP_KERNEL); + if (!buffer) { + dev_err(&spi->dev, "Error: Can't allocate memory!\n"); +- return; ++ goto out; + } + + /* +@@ -160,7 +160,7 @@ static void firmware_load(const struct firmware *fw, void *context) + "Error: Timeout waiting for FPGA to clear (status=%08x)!\n", + status); + kfree(buffer); +- return; ++ goto out; + } + + dev_info(&spi->dev, "Configuring the FPGA...\n"); +@@ -186,7 +186,7 @@ static void firmware_load(const struct firmware *fw, void *context) + release_firmware(fw); + + kfree(buffer); +- ++out: + complete(&data->fw_loaded); + } + +-- +2.34.1 + diff --git a/queue-4.14/mlxsw-pci-add-shutdown-method-in-pci-driver.patch b/queue-4.14/mlxsw-pci-add-shutdown-method-in-pci-driver.patch new file mode 100644 index 00000000000..73c1af2de7f --- /dev/null +++ b/queue-4.14/mlxsw-pci-add-shutdown-method-in-pci-driver.patch @@ -0,0 +1,96 @@ +From abf3dd7df79ce7454dadc8a19a1821aa50ff2290 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Nov 2021 09:54:47 +0200 +Subject: mlxsw: pci: Add shutdown method in PCI driver + +From: Danielle Ratson + +[ Upstream commit c1020d3cf4752f61a6a413f632ea2ce2370e150d ] + +On an arm64 platform with the Spectrum ASIC, after loading and executing +a new kernel via kexec, the following trace [1] is observed. This seems +to be caused by the fact that the device is not properly shutdown before +executing the new kernel. + +Fix this by implementing a shutdown method which mirrors the remove +method, as recommended by the kexec maintainer [2][3]. + +[1] +BUG: Bad page state in process devlink pfn:22f73d +page:fffffe00089dcf40 refcount:-1 mapcount:0 mapping:0000000000000000 index:0x0 +flags: 0x2ffff00000000000() +raw: 2ffff00000000000 0000000000000000 ffffffff089d0201 0000000000000000 +raw: 0000000000000000 0000000000000000 ffffffffffffffff 0000000000000000 +page dumped because: nonzero _refcount +Modules linked in: +CPU: 1 PID: 16346 Comm: devlink Tainted: G B 5.8.0-rc6-custom-273020-gac6b365b1bf5 #44 +Hardware name: Marvell Armada 7040 TX4810M (DT) +Call trace: + dump_backtrace+0x0/0x1d0 + show_stack+0x1c/0x28 + dump_stack+0xbc/0x118 + bad_page+0xcc/0xf8 + check_free_page_bad+0x80/0x88 + __free_pages_ok+0x3f8/0x418 + __free_pages+0x38/0x60 + kmem_freepages+0x200/0x2a8 + slab_destroy+0x28/0x68 + slabs_destroy+0x60/0x90 + ___cache_free+0x1b4/0x358 + kfree+0xc0/0x1d0 + skb_free_head+0x2c/0x38 + skb_release_data+0x110/0x1a0 + skb_release_all+0x2c/0x38 + consume_skb+0x38/0x130 + __dev_kfree_skb_any+0x44/0x50 + mlxsw_pci_rdq_fini+0x8c/0xb0 + mlxsw_pci_queue_fini.isra.0+0x28/0x58 + mlxsw_pci_queue_group_fini+0x58/0x88 + mlxsw_pci_aqs_fini+0x2c/0x60 + mlxsw_pci_fini+0x34/0x50 + mlxsw_core_bus_device_unregister+0x104/0x1d0 + mlxsw_devlink_core_bus_device_reload_down+0x2c/0x48 + devlink_reload+0x44/0x158 + devlink_nl_cmd_reload+0x270/0x290 + genl_rcv_msg+0x188/0x2f0 + netlink_rcv_skb+0x5c/0x118 + genl_rcv+0x3c/0x50 + netlink_unicast+0x1bc/0x278 + netlink_sendmsg+0x194/0x390 + __sys_sendto+0xe0/0x158 + __arm64_sys_sendto+0x2c/0x38 + el0_svc_common.constprop.0+0x70/0x168 + do_el0_svc+0x28/0x88 + el0_sync_handler+0x88/0x190 + el0_sync+0x140/0x180 + +[2] +https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1195432.html + +[3] +https://patchwork.kernel.org/project/linux-scsi/patch/20170212214920.28866-1-anton@ozlabs.org/#20116693 + +Cc: Eric Biederman +Signed-off-by: Danielle Ratson +Signed-off-by: Ido Schimmel +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c +index 6ef20e5cc77dd..de93c77148684 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c +@@ -1772,6 +1772,7 @@ int mlxsw_pci_driver_register(struct pci_driver *pci_driver) + { + pci_driver->probe = mlxsw_pci_probe; + pci_driver->remove = mlxsw_pci_remove; ++ pci_driver->shutdown = mlxsw_pci_remove; + return pci_register_driver(pci_driver); + } + EXPORT_SYMBOL(mlxsw_pci_driver_register); +-- +2.34.1 + diff --git a/queue-4.14/mmc-core-fixup-storing-of-ocr-for-mmc_quirk_nonstd_s.patch b/queue-4.14/mmc-core-fixup-storing-of-ocr-for-mmc_quirk_nonstd_s.patch new file mode 100644 index 00000000000..9b9d501abe6 --- /dev/null +++ b/queue-4.14/mmc-core-fixup-storing-of-ocr-for-mmc_quirk_nonstd_s.patch @@ -0,0 +1,57 @@ +From a02d63828b1cd4e7f614d76a2292531c4f1bc45e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Nov 2021 18:17:09 +0100 +Subject: mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO + +From: Ulf Hansson + +[ Upstream commit 8c3e5b74b9e2146f564905e50ca716591c76d4f1 ] + +The mmc core takes a specific path to support initializing of a +non-standard SDIO card. This is triggered by looking for the card-quirk, +MMC_QUIRK_NONSTD_SDIO. + +In mmc_sdio_init_card() this gets rather messy, as it causes the code to +bail out earlier, compared to the usual path. This leads to that the OCR +doesn't get saved properly in card->ocr. Fortunately, only omap_hsmmc has +been using the MMC_QUIRK_NONSTD_SDIO and is dealing with the issue, by +assigning a hardcoded value (0x80) to card->ocr from an ->init_card() ops. + +To make the behaviour consistent, let's instead rely on the core to save +the OCR in card->ocr during initialization. + +Reported-by: H. Nikolaus Schaller +Signed-off-by: Ulf Hansson +Signed-off-by: H. Nikolaus Schaller +Link: https://lore.kernel.org/r/e7936cff7fc24d187ef2680d3b4edb0ade58f293.1636564631.git.hns@goldelico.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/core/sdio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c +index 7568cea559220..bf0a0ef60d6b4 100644 +--- a/drivers/mmc/core/sdio.c ++++ b/drivers/mmc/core/sdio.c +@@ -631,6 +631,8 @@ try_again: + if (host->ops->init_card) + host->ops->init_card(host, card); + ++ card->ocr = ocr_card; ++ + /* + * If the host and card support UHS-I mode request the card + * to switch to 1.8V signaling level. No 1.8v signalling if +@@ -737,7 +739,7 @@ try_again: + + card = oldcard; + } +- card->ocr = ocr_card; ++ + mmc_fixup_device(card, sdio_fixup_methods); + + if (card->type == MMC_TYPE_SD_COMBO) { +-- +2.34.1 + diff --git a/queue-4.14/mwifiex-fix-skb_over_panic-in-mwifiex_usb_recv.patch b/queue-4.14/mwifiex-fix-skb_over_panic-in-mwifiex_usb_recv.patch new file mode 100644 index 00000000000..bab817f27d0 --- /dev/null +++ b/queue-4.14/mwifiex-fix-skb_over_panic-in-mwifiex_usb_recv.patch @@ -0,0 +1,68 @@ +From bffb088f53d7ed1440468a952bc15e3875361c36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Oct 2021 22:42:50 -0400 +Subject: mwifiex: Fix skb_over_panic in mwifiex_usb_recv() + +From: Zekun Shen + +[ Upstream commit 04d80663f67ccef893061b49ec8a42ff7045ae84 ] + +Currently, with an unknown recv_type, mwifiex_usb_recv +just return -1 without restoring the skb. Next time +mwifiex_usb_rx_complete is invoked with the same skb, +calling skb_put causes skb_over_panic. + +The bug is triggerable with a compromised/malfunctioning +usb device. After applying the patch, skb_over_panic +no longer shows up with the same input. + +Attached is the panic report from fuzzing. +skbuff: skb_over_panic: text:000000003bf1b5fa + len:2048 put:4 head:00000000dd6a115b data:000000000a9445d8 + tail:0x844 end:0x840 dev: +kernel BUG at net/core/skbuff.c:109! +invalid opcode: 0000 [#1] SMP KASAN NOPTI +CPU: 0 PID: 198 Comm: in:imklog Not tainted 5.6.0 #60 +RIP: 0010:skb_panic+0x15f/0x161 +Call Trace: + + ? mwifiex_usb_rx_complete+0x26b/0xfcd [mwifiex_usb] + skb_put.cold+0x24/0x24 + mwifiex_usb_rx_complete+0x26b/0xfcd [mwifiex_usb] + __usb_hcd_giveback_urb+0x1e4/0x380 + usb_giveback_urb_bh+0x241/0x4f0 + ? __hrtimer_run_queues+0x316/0x740 + ? __usb_hcd_giveback_urb+0x380/0x380 + tasklet_action_common.isra.0+0x135/0x330 + __do_softirq+0x18c/0x634 + irq_exit+0x114/0x140 + smp_apic_timer_interrupt+0xde/0x380 + apic_timer_interrupt+0xf/0x20 + + +Reported-by: Brendan Dolan-Gavitt +Signed-off-by: Zekun Shen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/YX4CqjfRcTa6bVL+@Zekuns-MBP-16.fios-router.home +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c +index 202ce83cb7948..f279cd4e78ff9 100644 +--- a/drivers/net/wireless/marvell/mwifiex/usb.c ++++ b/drivers/net/wireless/marvell/mwifiex/usb.c +@@ -130,7 +130,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter, + default: + mwifiex_dbg(adapter, ERROR, + "unknown recv_type %#x\n", recv_type); +- return -1; ++ ret = -1; ++ goto exit_restore_skb; + } + break; + case MWIFIEX_USB_EP_DATA: +-- +2.34.1 + diff --git a/queue-4.14/net-bonding-debug-avoid-printing-debug-logs-when-bon.patch b/queue-4.14/net-bonding-debug-avoid-printing-debug-logs-when-bon.patch new file mode 100644 index 00000000000..04f8f3025a2 --- /dev/null +++ b/queue-4.14/net-bonding-debug-avoid-printing-debug-logs-when-bon.patch @@ -0,0 +1,69 @@ +From d014ca87bbe7a4c143825d09877cebd48e00ba24 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Dec 2021 11:17:09 +0530 +Subject: net: bonding: debug: avoid printing debug logs when bond is not + notifying peers + +From: Suresh Kumar + +[ Upstream commit fee32de284ac277ba434a2d59f8ce46528ff3946 ] + +Currently "bond_should_notify_peers: slave ..." messages are printed whenever +"bond_should_notify_peers" function is called. + ++++ +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): Received LACPDU on port 1 +Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): Rx Machine: Port=1, Last State=6, Curr State=6 +Dec 12 12:33:26 node1 kernel: bond0: (slave enp0s25): partner sync=1 +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:26 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +... +Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): Received LACPDU on port 2 +Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): Rx Machine: Port=2, Last State=6, Curr State=6 +Dec 12 12:33:30 node1 kernel: bond0: (slave enp4s3): partner sync=1 +Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 +Dec 12 12:33:30 node1 kernel: bond0: bond_should_notify_peers: slave enp0s25 ++++ + +This is confusing and can also clutter up debug logs. +Print logs only when the peer notification happens. + +Signed-off-by: Suresh Kumar +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/bonding/bond_main.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c +index 340e7bf6463ec..7096fcbf699c0 100644 +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -782,14 +782,14 @@ static bool bond_should_notify_peers(struct bonding *bond) + slave = rcu_dereference(bond->curr_active_slave); + rcu_read_unlock(); + +- netdev_dbg(bond->dev, "bond_should_notify_peers: slave %s\n", +- slave ? slave->dev->name : "NULL"); +- + if (!slave || !bond->send_peer_notif || + !netif_carrier_ok(bond->dev) || + test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state)) + return false; + ++ netdev_dbg(bond->dev, "bond_should_notify_peers: slave %s\n", ++ slave ? slave->dev->name : "NULL"); ++ + return true; + } + +-- +2.34.1 + diff --git a/queue-4.14/net-mcs7830-handle-usb-read-errors-properly.patch b/queue-4.14/net-mcs7830-handle-usb-read-errors-properly.patch new file mode 100644 index 00000000000..a1eef4069e8 --- /dev/null +++ b/queue-4.14/net-mcs7830-handle-usb-read-errors-properly.patch @@ -0,0 +1,56 @@ +From 3ee186765d9772888973590038b5e1fee1340cca Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Jan 2022 01:57:16 +0300 +Subject: net: mcs7830: handle usb read errors properly + +From: Pavel Skripkin + +[ Upstream commit d668769eb9c52b150753f1653f7f5a0aeb8239d2 ] + +Syzbot reported uninit value in mcs7830_bind(). The problem was in +missing validation check for bytes read via usbnet_read_cmd(). + +usbnet_read_cmd() internally calls usb_control_msg(), that returns +number of bytes read. Code should validate that requested number of bytes +was actually read. + +So, this patch adds missing size validation check inside +mcs7830_get_reg() to prevent uninit value bugs + +Reported-and-tested-by: syzbot+003c0a286b9af5412510@syzkaller.appspotmail.com +Fixes: 2a36d7083438 ("USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter") +Signed-off-by: Pavel Skripkin +Reviewed-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20220106225716.7425-1-paskripkin@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/mcs7830.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 5a47e5510ca82..c0f52a622964f 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -121,8 +121,16 @@ static const char driver_name[] = "MOSCHIP usb-ethernet driver"; + + static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data) + { +- return usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ, +- 0x0000, index, data, size); ++ int ret; ++ ++ ret = usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ, ++ 0x0000, index, data, size); ++ if (ret < 0) ++ return ret; ++ else if (ret < size) ++ return -ENODATA; ++ ++ return ret; + } + + static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, const void *data) +-- +2.34.1 + diff --git a/queue-4.14/net-mdio-demote-probed-message-to-debug-print.patch b/queue-4.14/net-mdio-demote-probed-message-to-debug-print.patch new file mode 100644 index 00000000000..a64c8ff9e7d --- /dev/null +++ b/queue-4.14/net-mdio-demote-probed-message-to-debug-print.patch @@ -0,0 +1,40 @@ +From b0e4f776dd7ea3553893351f2cfe668ec0b1a7de Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Jan 2022 11:40:24 -0800 +Subject: net: mdio: Demote probed message to debug print + +From: Florian Fainelli + +[ Upstream commit 7590fc6f80ac2cbf23e6b42b668bbeded070850b ] + +On systems with large numbers of MDIO bus/muxes the message indicating +that a given MDIO bus has been successfully probed is repeated for as +many buses we have, which can eat up substantial boot time for no +reason, demote to a debug print. + +Reported-by: Maxime Bizon +Signed-off-by: Florian Fainelli +Reviewed-by: Andrew Lunn +Link: https://lore.kernel.org/r/20220103194024.2620-1-f.fainelli@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/phy/mdio_bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c +index 5ef9bbbab3dbb..7b9480ce21a21 100644 +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -392,7 +392,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) + mdiobus_setup_mdiodev_from_board_info(bus, mdiobus_create_device); + + bus->state = MDIOBUS_REGISTERED; +- pr_info("%s: probed\n", bus->name); ++ dev_dbg(&bus->dev, "probed\n"); + return 0; + + error: +-- +2.34.1 + diff --git a/queue-4.14/net-phy-marvell-configure-rgmii-delays-for-88e1118.patch b/queue-4.14/net-phy-marvell-configure-rgmii-delays-for-88e1118.patch new file mode 100644 index 00000000000..1122130c09a --- /dev/null +++ b/queue-4.14/net-phy-marvell-configure-rgmii-delays-for-88e1118.patch @@ -0,0 +1,55 @@ +From 2af44d57be646d47522d1b268e509bd149b87100 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 4 Jan 2022 16:38:19 +0000 +Subject: net: phy: marvell: configure RGMII delays for 88E1118 + +From: Russell King (Oracle) + +[ Upstream commit f22725c95ececb703c3f741e8f946d23705630b7 ] + +Corentin Labbe reports that the SSI 1328 does not work when allowing +the PHY to operate at gigabit speeds, but does work with the generic +PHY driver. + +This appears to be because m88e1118_config_init() writes a fixed value +to the MSCR register, claiming that this is to enable 1G speeds. +However, this always sets bits 4 and 5, enabling RGMII transmit and +receive delays. The suspicion is that the original board this was +added for required the delays to make 1G speeds work. + +Add the necessary configuration for RGMII delays for the 88E1118 to +bring this into line with the requirements for RGMII support, and thus +make the SSI 1328 work. + +Corentin Labbe has tested this on gemini-ssi1328 and gemini-ns2502. + +Reported-by: Corentin Labbe +Tested-by: Corentin Labbe +Signed-off-by: Russell King (Oracle) +Reviewed-by: Andrew Lunn +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/phy/marvell.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c +index 727b991312a4e..3d8d765932934 100644 +--- a/drivers/net/phy/marvell.c ++++ b/drivers/net/phy/marvell.c +@@ -938,6 +938,12 @@ static int m88e1118_config_init(struct phy_device *phydev) + if (err < 0) + return err; + ++ if (phy_interface_is_rgmii(phydev)) { ++ err = m88e1121_config_aneg_rgmii_delays(phydev); ++ if (err < 0) ++ return err; ++ } ++ + /* Adjust LED Control */ + if (phydev->dev_flags & MARVELL_PHY_M1118_DNS323_LEDS) + err = phy_write(phydev, 0x10, 0x1100); +-- +2.34.1 + diff --git a/queue-4.14/netfilter-bridge-add-support-for-pppoe-filtering.patch b/queue-4.14/netfilter-bridge-add-support-for-pppoe-filtering.patch new file mode 100644 index 00000000000..5a37ff79048 --- /dev/null +++ b/queue-4.14/netfilter-bridge-add-support-for-pppoe-filtering.patch @@ -0,0 +1,77 @@ +From 396ce39fe31c8c71798c92adb21035676ac47d22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Nov 2021 12:50:31 +0100 +Subject: netfilter: bridge: add support for pppoe filtering + +From: Florian Westphal + +[ Upstream commit 28b78ecffea8078d81466b2e01bb5a154509f1ba ] + +This makes 'bridge-nf-filter-pppoe-tagged' sysctl work for +bridged traffic. + +Looking at the original commit it doesn't appear this ever worked: + + static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, +[..] + if (skb->protocol == htons(ETH_P_8021Q)) { + skb_pull(skb, VLAN_HLEN); + skb->network_header += VLAN_HLEN; ++ } else if (skb->protocol == htons(ETH_P_PPP_SES)) { ++ skb_pull(skb, PPPOE_SES_HLEN); ++ skb->network_header += PPPOE_SES_HLEN; + } + [..] + NF_HOOK(... POST_ROUTING, ...) + +... but the adjusted offsets are never restored. + +The alternative would be to rip this code out for good, +but otoh we'd have to keep this anyway for the vlan handling +(which works because vlan tag info is in the skb, not the packet + payload). + +Reported-and-tested-by: Amish Chana +Fixes: 516299d2f5b6f97 ("[NETFILTER]: bridge-nf: filter bridged IPv4/IPv6 encapsulated in pppoe traffic") +Signed-off-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/bridge/br_netfilter_hooks.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c +index 8155c3d811a14..7e50bd9f36112 100644 +--- a/net/bridge/br_netfilter_hooks.c ++++ b/net/bridge/br_netfilter_hooks.c +@@ -724,6 +724,9 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff + if (nf_bridge->frag_max_size && nf_bridge->frag_max_size < mtu) + mtu = nf_bridge->frag_max_size; + ++ nf_bridge_update_protocol(skb); ++ nf_bridge_push_encap_header(skb); ++ + if (skb_is_gso(skb) || skb->len + mtu_reserved <= mtu) { + nf_bridge_info_free(skb); + return br_dev_queue_push_xmit(net, sk, skb); +@@ -741,8 +744,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff + + IPCB(skb)->frag_max_size = nf_bridge->frag_max_size; + +- nf_bridge_update_protocol(skb); +- + data = this_cpu_ptr(&brnf_frag_data_storage); + + data->vlan_tci = skb->vlan_tci; +@@ -765,8 +766,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff + + IP6CB(skb)->frag_max_size = nf_bridge->frag_max_size; + +- nf_bridge_update_protocol(skb); +- + data = this_cpu_ptr(&brnf_frag_data_storage); + data->encap_size = nf_bridge_encap_header_len(skb); + data->size = ETH_HLEN + data->encap_size; +-- +2.34.1 + diff --git a/queue-4.14/parisc-avoid-calling-faulthandler_disabled-twice.patch b/queue-4.14/parisc-avoid-calling-faulthandler_disabled-twice.patch new file mode 100644 index 00000000000..050e1e03697 --- /dev/null +++ b/queue-4.14/parisc-avoid-calling-faulthandler_disabled-twice.patch @@ -0,0 +1,53 @@ +From cfb4a834c56ac315d10f33943e70eca6187ea78a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 16:52:26 +0000 +Subject: parisc: Avoid calling faulthandler_disabled() twice + +From: John David Anglin + +[ Upstream commit 9e9d4b460f23bab61672eae397417d03917d116c ] + +In handle_interruption(), we call faulthandler_disabled() to check whether the +fault handler is not disabled. If the fault handler is disabled, we immediately +call do_page_fault(). It then calls faulthandler_disabled(). If disabled, +do_page_fault() attempts to fixup the exception by jumping to no_context: + +no_context: + + if (!user_mode(regs) && fixup_exception(regs)) { + return; + } + + parisc_terminate("Bad Address (null pointer deref?)", regs, code, address); + +Apart from the error messages, the two blocks of code perform the same +function. + +We can avoid two calls to faulthandler_disabled() by a simple revision +to the code in handle_interruption(). + +Note: I didn't try to fix the formatting of this code block. + +Signed-off-by: John David Anglin +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + arch/parisc/kernel/traps.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c +index 9a898d68f4a0d..346456c43aa0b 100644 +--- a/arch/parisc/kernel/traps.c ++++ b/arch/parisc/kernel/traps.c +@@ -795,7 +795,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) + * unless pagefault_disable() was called before. + */ + +- if (fault_space == 0 && !faulthandler_disabled()) ++ if (faulthandler_disabled() || fault_space == 0) + { + /* Clean up and return if in exception table. */ + if (fixup_exception(regs)) +-- +2.34.1 + diff --git a/queue-4.14/pcmcia-fix-setting-of-kthread-task-states.patch b/queue-4.14/pcmcia-fix-setting-of-kthread-task-states.patch new file mode 100644 index 00000000000..e6e2fca0a2c --- /dev/null +++ b/queue-4.14/pcmcia-fix-setting-of-kthread-task-states.patch @@ -0,0 +1,55 @@ +From d16bbb72812e36e20849318c9d86cec9d9fa418f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 9 Jan 2022 10:02:51 +0100 +Subject: pcmcia: fix setting of kthread task states + +From: Dominik Brodowski + +[ Upstream commit fbb3485f1f931102d8ba606f1c28123f5b48afa3 ] + +We need to set TASK_INTERRUPTIBLE before calling kthread_should_stop(). +Otherwise, kthread_stop() might see that the pccardd thread is still +in TASK_RUNNING state and fail to wake it up. + +Additionally, we only need to set the state back to TASK_RUNNING if +kthread_should_stop() breaks the loop. + +Cc: Greg Kroah-Hartman +Reported-by: Al Viro +Reviewed-by: Matthew Wilcox (Oracle) +Fixes: d3046ba809ce ("pcmcia: fix a boot time warning in pcmcia cs code") +Signed-off-by: Dominik Brodowski +Signed-off-by: Sasha Levin +--- + drivers/pcmcia/cs.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c +index 8c8caec3a72cc..182e5ef4ab83d 100644 +--- a/drivers/pcmcia/cs.c ++++ b/drivers/pcmcia/cs.c +@@ -669,18 +669,16 @@ static int pccardd(void *__skt) + if (events || sysfs_events) + continue; + ++ set_current_state(TASK_INTERRUPTIBLE); + if (kthread_should_stop()) + break; + +- set_current_state(TASK_INTERRUPTIBLE); +- + schedule(); + +- /* make sure we are running */ +- __set_current_state(TASK_RUNNING); +- + try_to_freeze(); + } ++ /* make sure we are running before we exit */ ++ __set_current_state(TASK_RUNNING); + + /* shut down socket, if a device is still present */ + if (skt->state & SOCKET_PRESENT) { +-- +2.34.1 + diff --git a/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch b/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch new file mode 100644 index 00000000000..9fde8de7123 --- /dev/null +++ b/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch @@ -0,0 +1,56 @@ +From 743b7560da4f34f402c5c661b1bde4271eec9c6a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 00:59:23 +0800 +Subject: pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in + __nonstatic_find_io_region() + +From: Zhou Qingyang + +[ Upstream commit ca0fe0d7c35c97528bdf621fdca75f13157c27af ] + +In __nonstatic_find_io_region(), pcmcia_make_resource() is assigned to +res and used in pci_bus_alloc_resource(). There is a dereference of res +in pci_bus_alloc_resource(), which could lead to a NULL pointer +dereference on failure of pcmcia_make_resource(). + +Fix this bug by adding a check of res. + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_PCCARD_NONSTATIC=y show no new warnings, +and our static analyzer no longer warns about this code. + +Fixes: 49b1153adfe1 ("pcmcia: move all pcmcia_resource_ops providers into one module") +Signed-off-by: Zhou Qingyang +[linux@dominikbrodowski.net: Fix typo in commit message] +Signed-off-by: Dominik Brodowski +Signed-off-by: Sasha Levin +--- + drivers/pcmcia/rsrc_nonstatic.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c +index 5ef7b46a25786..4d244014f423f 100644 +--- a/drivers/pcmcia/rsrc_nonstatic.c ++++ b/drivers/pcmcia/rsrc_nonstatic.c +@@ -693,6 +693,9 @@ static struct resource *__nonstatic_find_io_region(struct pcmcia_socket *s, + unsigned long min = base; + int ret; + ++ if (!res) ++ return NULL; ++ + data.mask = align - 1; + data.offset = base & data.mask; + data.map = &s_data->io_db; +-- +2.34.1 + diff --git a/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch-8110 b/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch-8110 new file mode 100644 index 00000000000..c6d6fb960eb --- /dev/null +++ b/queue-4.14/pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch-8110 @@ -0,0 +1,55 @@ +From 96d4029cdc81386118bffa145dad5b7783d7b4f9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Dec 2021 02:11:40 +0800 +Subject: pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in + nonstatic_find_mem_region() + +From: Zhou Qingyang + +[ Upstream commit 977d2e7c63c3d04d07ba340b39987742e3241554 ] + +In nonstatic_find_mem_region(), pcmcia_make_resource() is assigned to +res and used in pci_bus_alloc_resource(). There a dereference of res +in pci_bus_alloc_resource(), which could lead to a NULL pointer +dereference on failure of pcmcia_make_resource(). + +Fix this bug by adding a check of res. + +This bug was found by a static analyzer. The analysis employs +differential checking to identify inconsistent security operations +(e.g., checks or kfrees) between two code paths and confirms that the +inconsistent operations are not recovered in the current function or +the callers, so they constitute bugs. + +Note that, as a bug found by static analysis, it can be a false +positive or hard to trigger. Multiple researchers have cross-reviewed +the bug. + +Builds with CONFIG_PCCARD_NONSTATIC=y show no new warnings, +and our static analyzer no longer warns about this code. + +Fixes: 49b1153adfe1 ("pcmcia: move all pcmcia_resource_ops providers into one module") +Signed-off-by: Zhou Qingyang +Signed-off-by: Dominik Brodowski +Signed-off-by: Sasha Levin +--- + drivers/pcmcia/rsrc_nonstatic.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c +index 4d244014f423f..2e96d9273b780 100644 +--- a/drivers/pcmcia/rsrc_nonstatic.c ++++ b/drivers/pcmcia/rsrc_nonstatic.c +@@ -815,6 +815,9 @@ static struct resource *nonstatic_find_mem_region(u_long base, u_long num, + unsigned long min, max; + int ret, i, j; + ++ if (!res) ++ return NULL; ++ + low = low || !(s->features & SS_CAP_PAGE_REGS); + + data.mask = align - 1; +-- +2.34.1 + diff --git a/queue-4.14/power-bq25890-enable-continuous-conversion-for-adc-a.patch b/queue-4.14/power-bq25890-enable-continuous-conversion-for-adc-a.patch new file mode 100644 index 00000000000..40ff4d65346 --- /dev/null +++ b/queue-4.14/power-bq25890-enable-continuous-conversion-for-adc-a.patch @@ -0,0 +1,43 @@ +From 8900c0e031aae12ba4245bd34724bd7b98bc99d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Nov 2021 23:20:01 +0300 +Subject: power: bq25890: Enable continuous conversion for ADC at charging + +From: Yauhen Kharuzhy + +[ Upstream commit 80211be1b9dec04cc2805d3d81e2091ecac289a1 ] + +Instead of one shot run of ADC at beginning of charging, run continuous +conversion to ensure that all charging-related values are monitored +properly (input voltage, input current, themperature etc.). + +Signed-off-by: Yauhen Kharuzhy +Reviewed-by: Hans de Goede +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/power/supply/bq25890_charger.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c +index 8e2c41ded171c..e90253b3f6561 100644 +--- a/drivers/power/supply/bq25890_charger.c ++++ b/drivers/power/supply/bq25890_charger.c +@@ -521,12 +521,12 @@ static void bq25890_handle_state_change(struct bq25890_device *bq, + + if (!new_state->online) { /* power removed */ + /* disable ADC */ +- ret = bq25890_field_write(bq, F_CONV_START, 0); ++ ret = bq25890_field_write(bq, F_CONV_RATE, 0); + if (ret < 0) + goto error; + } else if (!old_state.online) { /* power inserted */ + /* enable ADC, to have control of charge current/voltage */ +- ret = bq25890_field_write(bq, F_CONV_START, 1); ++ ret = bq25890_field_write(bq, F_CONV_RATE, 1); + if (ret < 0) + goto error; + } +-- +2.34.1 + diff --git a/queue-4.14/powerpc-6xx-add-missing-of_node_put.patch b/queue-4.14/powerpc-6xx-add-missing-of_node_put.patch new file mode 100644 index 00000000000..6a9f78d4c6d --- /dev/null +++ b/queue-4.14/powerpc-6xx-add-missing-of_node_put.patch @@ -0,0 +1,64 @@ +From a9fa92a81b364c2aa80f81948910a21625a5777c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Nov 2015 20:33:19 +0000 +Subject: powerpc/6xx: add missing of_node_put + +From: Julia Lawall + +[ Upstream commit f6e82647ff71d427d4148964b71f239fba9d7937 ] + +for_each_compatible_node performs an of_node_get on each iteration, so +a break out of the loop requires an of_node_put. + +A simplified version of the semantic patch that fixes this problem is as +follows (http://coccinelle.lip6.fr): + +// +@@ +expression e; +local idexpression n; +@@ + +@@ +local idexpression n; +expression e; +@@ + + for_each_compatible_node(n,...) { + ... +( + of_node_put(n); +| + e = n +| ++ of_node_put(n); +? break; +) + ... + } +... when != n +// + +Signed-off-by: Julia Lawall +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1448051604-25256-2-git-send-email-Julia.Lawall@lip6.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +index bf4a125faec66..db2ea6b6889de 100644 +--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c ++++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +@@ -220,6 +220,7 @@ void hlwd_pic_probe(void) + irq_set_chained_handler(cascade_virq, + hlwd_pic_irq_cascade); + hlwd_irq_host = host; ++ of_node_put(np); + break; + } + } +-- +2.34.1 + diff --git a/queue-4.14/powerpc-btext-add-missing-of_node_put.patch b/queue-4.14/powerpc-btext-add-missing-of_node_put.patch new file mode 100644 index 00000000000..0599c72d533 --- /dev/null +++ b/queue-4.14/powerpc-btext-add-missing-of_node_put.patch @@ -0,0 +1,63 @@ +From d5da8fdaac5586a2210a820e517677bf307d7562 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Nov 2015 20:33:23 +0000 +Subject: powerpc/btext: add missing of_node_put + +From: Julia Lawall + +[ Upstream commit a1d2b210ffa52d60acabbf7b6af3ef7e1e69cda0 ] + +for_each_node_by_type performs an of_node_get on each iteration, so +a break out of the loop requires an of_node_put. + +A simplified version of the semantic patch that fixes this problem is as +follows (http://coccinelle.lip6.fr): + +// +@@ +local idexpression n; +expression e; +@@ + + for_each_node_by_type(n,...) { + ... +( + of_node_put(n); +| + e = n +| ++ of_node_put(n); +? break; +) + ... + } +... when != n +// + +Signed-off-by: Julia Lawall +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1448051604-25256-6-git-send-email-Julia.Lawall@lip6.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/btext.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c +index 6537cba1a7580..d1a2fc7186ce7 100644 +--- a/arch/powerpc/kernel/btext.c ++++ b/arch/powerpc/kernel/btext.c +@@ -258,8 +258,10 @@ int __init btext_find_display(int allow_nonstdout) + rc = btext_initialize(np); + printk("result: %d\n", rc); + } +- if (rc == 0) ++ if (rc == 0) { ++ of_node_put(np); + break; ++ } + } + return rc; + } +-- +2.34.1 + diff --git a/queue-4.14/powerpc-cell-add-missing-of_node_put.patch b/queue-4.14/powerpc-cell-add-missing-of_node_put.patch new file mode 100644 index 00000000000..e0722fb455f --- /dev/null +++ b/queue-4.14/powerpc-cell-add-missing-of_node_put.patch @@ -0,0 +1,57 @@ +From 545404e78acb4e8ab0b29d5a7ee5eb8d0a1e8737 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Nov 2015 21:33:24 +0100 +Subject: powerpc/cell: add missing of_node_put + +From: Julia Lawall + +[ Upstream commit a841fd009e51c8c0a8f07c942e9ab6bb48da8858 ] + +for_each_node_by_name performs an of_node_get on each iteration, so +a break out of the loop requires an of_node_put. + +A simplified version of the semantic patch that fixes this problem is as +follows (http://coccinelle.lip6.fr): + +// +@@ +expression e,e1; +local idexpression n; +@@ + + for_each_node_by_name(n, e1) { + ... when != of_node_put(n) + when != e = n +( + return n; +| ++ of_node_put(n); +? return ...; +) + ... + } +// + +Signed-off-by: Julia Lawall +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1448051604-25256-7-git-send-email-Julia.Lawall@lip6.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/cell/iommu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c +index 4b91ad08eefd9..c4f352387aec3 100644 +--- a/arch/powerpc/platforms/cell/iommu.c ++++ b/arch/powerpc/platforms/cell/iommu.c +@@ -1088,6 +1088,7 @@ static int __init cell_iommu_fixed_mapping_init(void) + if (hbase < dbase || (hend > (dbase + dsize))) { + pr_debug("iommu: hash window doesn't fit in" + "real DMA window\n"); ++ of_node_put(np); + return -1; + } + } +-- +2.34.1 + diff --git a/queue-4.14/powerpc-powernv-add-missing-of_node_put.patch b/queue-4.14/powerpc-powernv-add-missing-of_node_put.patch new file mode 100644 index 00000000000..7852cb56957 --- /dev/null +++ b/queue-4.14/powerpc-powernv-add-missing-of_node_put.patch @@ -0,0 +1,59 @@ +From fcd5dc11b8bc10e6dfcd66461e11367f98fb2571 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Nov 2015 20:33:21 +0000 +Subject: powerpc/powernv: add missing of_node_put + +From: Julia Lawall + +[ Upstream commit 7d405a939ca960162eb30c1475759cb2fdf38f8c ] + +for_each_compatible_node performs an of_node_get on each iteration, so +a break out of the loop requires an of_node_put. + +A simplified version of the semantic patch that fixes this problem is as +follows (http://coccinelle.lip6.fr): + +// +@@ +local idexpression n; +expression e; +@@ + + for_each_compatible_node(n,...) { + ... +( + of_node_put(n); +| + e = n +| ++ of_node_put(n); +? break; +) + ... + } +... when != n +// + +Signed-off-by: Julia Lawall +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/1448051604-25256-4-git-send-email-Julia.Lawall@lip6.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/powernv/opal-lpc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c +index 6c7ad1d8b32ed..21f0edcfb84ad 100644 +--- a/arch/powerpc/platforms/powernv/opal-lpc.c ++++ b/arch/powerpc/platforms/powernv/opal-lpc.c +@@ -400,6 +400,7 @@ void __init opal_lpc_init(void) + if (!of_get_property(np, "primary", NULL)) + continue; + opal_lpc_chip_id = of_get_ibm_chip_id(np); ++ of_node_put(np); + break; + } + if (opal_lpc_chip_id < 0) +-- +2.34.1 + diff --git a/queue-4.14/powerpc-prom_init-fix-improper-check-of-prom_getprop.patch b/queue-4.14/powerpc-prom_init-fix-improper-check-of-prom_getprop.patch new file mode 100644 index 00000000000..566dcd1b9bb --- /dev/null +++ b/queue-4.14/powerpc-prom_init-fix-improper-check-of-prom_getprop.patch @@ -0,0 +1,37 @@ +From d630ac81d3e31676c5b20b807355f25413a03fbe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Nov 2021 17:12:18 +0800 +Subject: powerpc/prom_init: Fix improper check of prom_getprop() + +From: Peiwei Hu + +[ Upstream commit 869fb7e5aecbc163003f93f36dcc26d0554319f6 ] + +prom_getprop() can return PROM_ERROR. Binary operator can not identify +it. + +Fixes: 94d2dde738a5 ("[POWERPC] Efika: prune fixups and make them more carefull") +Signed-off-by: Peiwei Hu +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/tencent_BA28CC6897B7C95A92EB8C580B5D18589105@qq.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/prom_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c +index f8782c7ef50f1..7f049a60747e9 100644 +--- a/arch/powerpc/kernel/prom_init.c ++++ b/arch/powerpc/kernel/prom_init.c +@@ -2774,7 +2774,7 @@ static void __init fixup_device_tree_efika_add_phy(void) + + /* Check if the phy-handle property exists - bail if it does */ + rv = prom_getprop(node, "phy-handle", prop, sizeof(prop)); +- if (!rv) ++ if (rv <= 0) + return; + + /* +-- +2.34.1 + diff --git a/queue-4.14/powerpc-smp-move-setup_profiling_timer-under-config_.patch b/queue-4.14/powerpc-smp-move-setup_profiling_timer-under-config_.patch new file mode 100644 index 00000000000..f50afff2c1b --- /dev/null +++ b/queue-4.14/powerpc-smp-move-setup_profiling_timer-under-config_.patch @@ -0,0 +1,44 @@ +From 53dd22db7950a3453137b5f09f190a720750e12f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Nov 2021 20:32:53 +1100 +Subject: powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michael Ellerman + +[ Upstream commit a4ac0d249a5db80e79d573db9e4ad29354b643a8 ] + +setup_profiling_timer() is only needed when CONFIG_PROFILING is enabled. + +Fixes the following W=1 warning when CONFIG_PROFILING=n: + linux/arch/powerpc/kernel/smp.c:1638:5: error: no previous prototype for ‘setup_profiling_timer’ + +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20211124093254.1054750-5-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/smp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c +index 7c7aa7c98ba31..cf25b95ceee13 100644 +--- a/arch/powerpc/kernel/smp.c ++++ b/arch/powerpc/kernel/smp.c +@@ -1009,10 +1009,12 @@ void start_secondary(void *unused) + BUG(); + } + ++#ifdef CONFIG_PROFILING + int setup_profiling_timer(unsigned int multiplier) + { + return 0; + } ++#endif + + #ifdef CONFIG_SCHED_SMT + /* cpumask of CPUs with asymetric SMT dependancy */ +-- +2.34.1 + diff --git a/queue-4.14/powerpc-watchdog-fix-missed-watchdog-reset-due-to-me.patch b/queue-4.14/powerpc-watchdog-fix-missed-watchdog-reset-due-to-me.patch new file mode 100644 index 00000000000..253f4f43e9f --- /dev/null +++ b/queue-4.14/powerpc-watchdog-fix-missed-watchdog-reset-due-to-me.patch @@ -0,0 +1,111 @@ +From f2d5d49206238a609bc4b92eacb252bb76b675a7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Nov 2021 12:50:53 +1000 +Subject: powerpc/watchdog: Fix missed watchdog reset due to memory ordering + race + +From: Nicholas Piggin + +[ Upstream commit 5dad4ba68a2483fc80d70b9dc90bbe16e1f27263 ] + +It is possible for all CPUs to miss the pending cpumask becoming clear, +and then nobody resetting it, which will cause the lockup detector to +stop working. It will eventually expire, but watchdog_smp_panic will +avoid doing anything if the pending mask is clear and it will never be +reset. + +Order the cpumask clear vs the subsequent test to close this race. + +Add an extra check for an empty pending mask when the watchdog fires and +finds its bit still clear, to try to catch any other possible races or +bugs here and keep the watchdog working. The extra test in +arch_touch_nmi_watchdog is required to prevent the new warning from +firing off. + +Signed-off-by: Nicholas Piggin +Reviewed-by: Laurent Dufour +Debugged-by: Laurent Dufour +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20211110025056.2084347-2-npiggin@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/watchdog.c | 41 +++++++++++++++++++++++++++++++++- + 1 file changed, 40 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c +index ce848ff84eddf..1617767ebc9ae 100644 +--- a/arch/powerpc/kernel/watchdog.c ++++ b/arch/powerpc/kernel/watchdog.c +@@ -106,6 +106,10 @@ static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb) + { + cpumask_or(&wd_smp_cpus_stuck, &wd_smp_cpus_stuck, cpumask); + cpumask_andnot(&wd_smp_cpus_pending, &wd_smp_cpus_pending, cpumask); ++ /* ++ * See wd_smp_clear_cpu_pending() ++ */ ++ smp_mb(); + if (cpumask_empty(&wd_smp_cpus_pending)) { + wd_smp_last_reset_tb = tb; + cpumask_andnot(&wd_smp_cpus_pending, +@@ -177,13 +181,44 @@ static void wd_smp_clear_cpu_pending(int cpu, u64 tb) + wd_smp_lock(&flags); + cpumask_clear_cpu(cpu, &wd_smp_cpus_stuck); + wd_smp_unlock(&flags); ++ } else { ++ /* ++ * The last CPU to clear pending should have reset the ++ * watchdog so we generally should not find it empty ++ * here if our CPU was clear. However it could happen ++ * due to a rare race with another CPU taking the ++ * last CPU out of the mask concurrently. ++ * ++ * We can't add a warning for it. But just in case ++ * there is a problem with the watchdog that is causing ++ * the mask to not be reset, try to kick it along here. ++ */ ++ if (unlikely(cpumask_empty(&wd_smp_cpus_pending))) ++ goto none_pending; + } + return; + } ++ + cpumask_clear_cpu(cpu, &wd_smp_cpus_pending); ++ ++ /* ++ * Order the store to clear pending with the load(s) to check all ++ * words in the pending mask to check they are all empty. This orders ++ * with the same barrier on another CPU. This prevents two CPUs ++ * clearing the last 2 pending bits, but neither seeing the other's ++ * store when checking if the mask is empty, and missing an empty ++ * mask, which ends with a false positive. ++ */ ++ smp_mb(); + if (cpumask_empty(&wd_smp_cpus_pending)) { + unsigned long flags; + ++none_pending: ++ /* ++ * Double check under lock because more than one CPU could see ++ * a clear mask with the lockless check after clearing their ++ * pending bits. ++ */ + wd_smp_lock(&flags); + if (cpumask_empty(&wd_smp_cpus_pending)) { + wd_smp_last_reset_tb = tb; +@@ -276,8 +311,12 @@ void arch_touch_nmi_watchdog(void) + { + unsigned long ticks = tb_ticks_per_usec * wd_timer_period_ms * 1000; + int cpu = smp_processor_id(); +- u64 tb = get_tb(); ++ u64 tb; ++ ++ if (!cpumask_test_cpu(cpu, &watchdog_cpumask)) ++ return; + ++ tb = get_tb(); + if (tb - per_cpu(wd_timer_tb, cpu) >= ticks) { + per_cpu(wd_timer_tb, cpu) = tb; + wd_smp_clear_cpu_pending(cpu, tb); +-- +2.34.1 + diff --git a/queue-4.14/ppp-ensure-minimum-packet-size-in-ppp_write.patch b/queue-4.14/ppp-ensure-minimum-packet-size-in-ppp_write.patch new file mode 100644 index 00000000000..41fd5c88196 --- /dev/null +++ b/queue-4.14/ppp-ensure-minimum-packet-size-in-ppp_write.patch @@ -0,0 +1,104 @@ +From dc02e02c58d7d3884483c0be76abc24d699c6681 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Jan 2022 03:48:42 -0800 +Subject: ppp: ensure minimum packet size in ppp_write() + +From: Eric Dumazet + +[ Upstream commit 44073187990d5629804ce0627525f6ea5cfef171 ] + +It seems pretty clear ppp layer assumed user space +would always be kind to provide enough data +in their write() to a ppp device. + +This patch makes sure user provides at least +2 bytes. + +It adds PPP_PROTO_LEN macro that could replace +in net-next many occurrences of hard-coded 2 value. + +I replaced only one occurrence to ease backports +to stable kernels. + +The bug manifests in the following report: + +BUG: KMSAN: uninit-value in ppp_send_frame+0x28d/0x27c0 drivers/net/ppp/ppp_generic.c:1740 + ppp_send_frame+0x28d/0x27c0 drivers/net/ppp/ppp_generic.c:1740 + __ppp_xmit_process+0x23e/0x4b0 drivers/net/ppp/ppp_generic.c:1640 + ppp_xmit_process+0x1fe/0x480 drivers/net/ppp/ppp_generic.c:1661 + ppp_write+0x5cb/0x5e0 drivers/net/ppp/ppp_generic.c:513 + do_iter_write+0xb0c/0x1500 fs/read_write.c:853 + vfs_writev fs/read_write.c:924 [inline] + do_writev+0x645/0xe00 fs/read_write.c:967 + __do_sys_writev fs/read_write.c:1040 [inline] + __se_sys_writev fs/read_write.c:1037 [inline] + __x64_sys_writev+0xe5/0x120 fs/read_write.c:1037 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +Uninit was created at: + slab_post_alloc_hook mm/slab.h:524 [inline] + slab_alloc_node mm/slub.c:3251 [inline] + __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 + kmalloc_reserve net/core/skbuff.c:354 [inline] + __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 + alloc_skb include/linux/skbuff.h:1126 [inline] + ppp_write+0x11d/0x5e0 drivers/net/ppp/ppp_generic.c:501 + do_iter_write+0xb0c/0x1500 fs/read_write.c:853 + vfs_writev fs/read_write.c:924 [inline] + do_writev+0x645/0xe00 fs/read_write.c:967 + __do_sys_writev fs/read_write.c:1040 [inline] + __se_sys_writev fs/read_write.c:1037 [inline] + __x64_sys_writev+0xe5/0x120 fs/read_write.c:1037 + do_syscall_x64 arch/x86/entry/common.c:51 [inline] + do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Eric Dumazet +Cc: Paul Mackerras +Cc: linux-ppp@vger.kernel.org +Reported-by: syzbot +Acked-by: Guillaume Nault +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ppp/ppp_generic.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c +index c6e067aae9551..81a4fe9706be6 100644 +--- a/drivers/net/ppp/ppp_generic.c ++++ b/drivers/net/ppp/ppp_generic.c +@@ -72,6 +72,8 @@ + #define MPHDRLEN 6 /* multilink protocol header length */ + #define MPHDRLEN_SSN 4 /* ditto with short sequence numbers */ + ++#define PPP_PROTO_LEN 2 ++ + /* + * An instance of /dev/ppp can be associated with either a ppp + * interface unit or a ppp channel. In both cases, file->private_data +@@ -501,6 +503,9 @@ static ssize_t ppp_write(struct file *file, const char __user *buf, + + if (!pf) + return -ENXIO; ++ /* All PPP packets should start with the 2-byte protocol */ ++ if (count < PPP_PROTO_LEN) ++ return -EINVAL; + ret = -ENOMEM; + skb = alloc_skb(count + pf->hdrlen, GFP_KERNEL); + if (!skb) +@@ -1564,7 +1569,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) + } + + ++ppp->stats64.tx_packets; +- ppp->stats64.tx_bytes += skb->len - 2; ++ ppp->stats64.tx_bytes += skb->len - PPP_PROTO_LEN; + + switch (proto) { + case PPP_IP: +-- +2.34.1 + diff --git a/queue-4.14/rdma-core-let-ib_find_gid-continue-search-even-after.patch b/queue-4.14/rdma-core-let-ib_find_gid-continue-search-even-after.patch new file mode 100644 index 00000000000..df37050247a --- /dev/null +++ b/queue-4.14/rdma-core-let-ib_find_gid-continue-search-even-after.patch @@ -0,0 +1,47 @@ +From 34d9a6105449eb015d326d91a1c1697f31697252 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Dec 2021 15:16:06 +0200 +Subject: RDMA/core: Let ib_find_gid() continue search even after empty entry + +From: Avihai Horon + +[ Upstream commit 483d805191a23191f8294bbf9b4e94836f5d92e4 ] + +Currently, ib_find_gid() will stop searching after encountering the first +empty GID table entry. This behavior is wrong since neither IB nor RoCE +spec enforce tightly packed GID tables. + +For example, when a valid GID entry exists at index N, and if a GID entry +is empty at index N-1, ib_find_gid() will fail to find the valid entry. + +Fix it by making ib_find_gid() continue searching even after encountering +missing entries. + +Fixes: 5eb620c81ce3 ("IB/core: Add helpers for uncached GID and P_Key searches") +Link: https://lore.kernel.org/r/e55d331b96cecfc2cf19803d16e7109ea966882d.1639055490.git.leonro@nvidia.com +Signed-off-by: Avihai Horon +Reviewed-by: Mark Zhang +Signed-off-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/device.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c +index 6b0d1d8609cad..b230f156a9964 100644 +--- a/drivers/infiniband/core/device.c ++++ b/drivers/infiniband/core/device.c +@@ -1075,7 +1075,8 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid, + for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) { + ret = ib_query_gid(device, port, i, &tmp_gid, NULL); + if (ret) +- return ret; ++ continue; ++ + if (!memcmp(&tmp_gid, gid, sizeof *gid)) { + *port_num = port; + if (index) +-- +2.34.1 + diff --git a/queue-4.14/rdma-cxgb4-set-queue-pair-state-when-being-queried.patch b/queue-4.14/rdma-cxgb4-set-queue-pair-state-when-being-queried.patch new file mode 100644 index 00000000000..04f041e7ca8 --- /dev/null +++ b/queue-4.14/rdma-cxgb4-set-queue-pair-state-when-being-queried.patch @@ -0,0 +1,37 @@ +From b8c1f2ec3a6c96a7d5207edc27382463d57e9a7a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Dec 2021 17:25:30 +0200 +Subject: RDMA/cxgb4: Set queue pair state when being queried + +From: Kamal Heib + +[ Upstream commit e375b9c92985e409c4bb95dd43d34915ea7f5e28 ] + +The API for ib_query_qp requires the driver to set cur_qp_state on return, +add the missing set. + +Fixes: 67bbc05512d8 ("RDMA/cxgb4: Add query_qp support") +Link: https://lore.kernel.org/r/20211220152530.60399-1-kamalheib1@gmail.com +Signed-off-by: Kamal Heib +Reviewed-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/cxgb4/qp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c +index 3255615807299..225d4466fcb24 100644 +--- a/drivers/infiniband/hw/cxgb4/qp.c ++++ b/drivers/infiniband/hw/cxgb4/qp.c +@@ -2115,6 +2115,7 @@ int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, + memset(attr, 0, sizeof *attr); + memset(init_attr, 0, sizeof *init_attr); + attr->qp_state = to_ib_qp_state(qhp->attr.state); ++ attr->cur_qp_state = to_ib_qp_state(qhp->attr.state); + init_attr->cap.max_send_wr = qhp->attr.sq_num_entries; + init_attr->cap.max_recv_wr = qhp->attr.rq_num_entries; + init_attr->cap.max_send_sge = qhp->attr.sq_max_sges; +-- +2.34.1 + diff --git a/queue-4.14/rdma-hns-validate-the-pkey-index.patch b/queue-4.14/rdma-hns-validate-the-pkey-index.patch new file mode 100644 index 00000000000..54fbbfa939d --- /dev/null +++ b/queue-4.14/rdma-hns-validate-the-pkey-index.patch @@ -0,0 +1,37 @@ +From 3e45a461ff2e0f6a5344b88d631b4a5a003ce3fa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 17 Nov 2021 16:59:54 +0200 +Subject: RDMA/hns: Validate the pkey index + +From: Kamal Heib + +[ Upstream commit 2a67fcfa0db6b4075515bd23497750849b88850f ] + +Before query pkey, make sure that the queried index is valid. + +Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver") +Link: https://lore.kernel.org/r/20211117145954.123893-1-kamalheib1@gmail.com +Signed-off-by: Kamal Heib +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c +index d9777b662eba9..6f64dc5262c0d 100644 +--- a/drivers/infiniband/hw/hns/hns_roce_main.c ++++ b/drivers/infiniband/hw/hns/hns_roce_main.c +@@ -294,6 +294,9 @@ static int hns_roce_query_gid(struct ib_device *ib_dev, u8 port_num, int index, + static int hns_roce_query_pkey(struct ib_device *ib_dev, u8 port, u16 index, + u16 *pkey) + { ++ if (index > 0) ++ return -EINVAL; ++ + *pkey = PKEY_ID; + + return 0; +-- +2.34.1 + diff --git a/queue-4.14/sched-rt-try-to-restart-rt-period-timer-when-rt-runt.patch b/queue-4.14/sched-rt-try-to-restart-rt-period-timer-when-rt-runt.patch new file mode 100644 index 00000000000..362ffef1ae5 --- /dev/null +++ b/queue-4.14/sched-rt-try-to-restart-rt-period-timer-when-rt-runt.patch @@ -0,0 +1,99 @@ +From dcfdcfd2bf2e5d3436435482e0266bef17b9e349 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 03:36:18 +0000 +Subject: sched/rt: Try to restart rt period timer when rt runtime exceeded + +From: Li Hua + +[ Upstream commit 9b58e976b3b391c0cf02e038d53dd0478ed3013c ] + +When rt_runtime is modified from -1 to a valid control value, it may +cause the task to be throttled all the time. Operations like the following +will trigger the bug. E.g: + + 1. echo -1 > /proc/sys/kernel/sched_rt_runtime_us + 2. Run a FIFO task named A that executes while(1) + 3. echo 950000 > /proc/sys/kernel/sched_rt_runtime_us + +When rt_runtime is -1, The rt period timer will not be activated when task +A enqueued. And then the task will be throttled after setting rt_runtime to +950,000. The task will always be throttled because the rt period timer is +not activated. + +Fixes: d0b27fa77854 ("sched: rt-group: synchonised bandwidth period") +Reported-by: Hulk Robot +Signed-off-by: Li Hua +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lkml.kernel.org/r/20211203033618.11895-1-hucool.lihua@huawei.com +Signed-off-by: Sasha Levin +--- + kernel/sched/rt.c | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c +index cc7dd1aaf08e3..c093bb0f52eb1 100644 +--- a/kernel/sched/rt.c ++++ b/kernel/sched/rt.c +@@ -52,11 +52,8 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime) + rt_b->rt_period_timer.function = sched_rt_period_timer; + } + +-static void start_rt_bandwidth(struct rt_bandwidth *rt_b) ++static inline void do_start_rt_bandwidth(struct rt_bandwidth *rt_b) + { +- if (!rt_bandwidth_enabled() || rt_b->rt_runtime == RUNTIME_INF) +- return; +- + raw_spin_lock(&rt_b->rt_runtime_lock); + if (!rt_b->rt_period_active) { + rt_b->rt_period_active = 1; +@@ -74,6 +71,14 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b) + raw_spin_unlock(&rt_b->rt_runtime_lock); + } + ++static void start_rt_bandwidth(struct rt_bandwidth *rt_b) ++{ ++ if (!rt_bandwidth_enabled() || rt_b->rt_runtime == RUNTIME_INF) ++ return; ++ ++ do_start_rt_bandwidth(rt_b); ++} ++ + void init_rt_rq(struct rt_rq *rt_rq) + { + struct rt_prio_array *array; +@@ -982,13 +987,17 @@ static void update_curr_rt(struct rq *rq) + + for_each_sched_rt_entity(rt_se) { + struct rt_rq *rt_rq = rt_rq_of_se(rt_se); ++ int exceeded; + + if (sched_rt_runtime(rt_rq) != RUNTIME_INF) { + raw_spin_lock(&rt_rq->rt_runtime_lock); + rt_rq->rt_time += delta_exec; +- if (sched_rt_runtime_exceeded(rt_rq)) ++ exceeded = sched_rt_runtime_exceeded(rt_rq); ++ if (exceeded) + resched_curr(rq); + raw_spin_unlock(&rt_rq->rt_runtime_lock); ++ if (exceeded) ++ do_start_rt_bandwidth(sched_rt_bandwidth(rt_rq)); + } + } + } +@@ -2629,8 +2638,12 @@ static int sched_rt_global_validate(void) + + static void sched_rt_do_global(void) + { ++ unsigned long flags; ++ ++ raw_spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags); + def_rt_bandwidth.rt_runtime = global_rt_runtime(); + def_rt_bandwidth.rt_period = ns_to_ktime(global_rt_period()); ++ raw_spin_unlock_irqrestore(&def_rt_bandwidth.rt_runtime_lock, flags); + } + + int sched_rt_handler(struct ctl_table *table, int write, +-- +2.34.1 + diff --git a/queue-4.14/scsi-sr-don-t-use-gfp_dma.patch b/queue-4.14/scsi-sr-don-t-use-gfp_dma.patch new file mode 100644 index 00000000000..180a5b9492d --- /dev/null +++ b/queue-4.14/scsi-sr-don-t-use-gfp_dma.patch @@ -0,0 +1,61 @@ +From be2d788ccecc8a57bad7ac63619c0f0ff25e2479 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 22 Dec 2021 10:08:42 +0100 +Subject: scsi: sr: Don't use GFP_DMA + +From: Christoph Hellwig + +[ Upstream commit d94d94969a4ba07a43d62429c60372320519c391 ] + +The allocated buffers are used as a command payload, for which the block +layer and/or DMA API do the proper bounce buffering if needed. + +Link: https://lore.kernel.org/r/20211222090842.920724-1-hch@lst.de +Reported-by: Baoquan He +Reviewed-by: Baoquan He +Signed-off-by: Christoph Hellwig +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/sr.c | 2 +- + drivers/scsi/sr_vendor.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c +index be2daf5536ff7..180087d1c6cdb 100644 +--- a/drivers/scsi/sr.c ++++ b/drivers/scsi/sr.c +@@ -885,7 +885,7 @@ static void get_capabilities(struct scsi_cd *cd) + + + /* allocate transfer buffer */ +- buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); ++ buffer = kmalloc(512, GFP_KERNEL); + if (!buffer) { + sr_printk(KERN_ERR, cd, "out of memory.\n"); + return; +diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c +index e3b0ce25162ba..2887be4316be9 100644 +--- a/drivers/scsi/sr_vendor.c ++++ b/drivers/scsi/sr_vendor.c +@@ -119,7 +119,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength) + density = (blocklength > 2048) ? 0x81 : 0x83; + #endif + +- buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); ++ buffer = kmalloc(512, GFP_KERNEL); + if (!buffer) + return -ENOMEM; + +@@ -167,7 +167,7 @@ int sr_cd_check(struct cdrom_device_info *cdi) + if (cd->cdi.mask & CDC_MULTI_SESSION) + return 0; + +- buffer = kmalloc(512, GFP_KERNEL | GFP_DMA); ++ buffer = kmalloc(512, GFP_KERNEL); + if (!buffer) + return -ENOMEM; + +-- +2.34.1 + diff --git a/queue-4.14/scsi-ufs-fix-race-conditions-related-to-driver-data.patch b/queue-4.14/scsi-ufs-fix-race-conditions-related-to-driver-data.patch new file mode 100644 index 00000000000..d29c1e7b545 --- /dev/null +++ b/queue-4.14/scsi-ufs-fix-race-conditions-related-to-driver-data.patch @@ -0,0 +1,73 @@ +From 90723084b340a8f43821df5109daf3c6c2155204 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 15:19:39 -0800 +Subject: scsi: ufs: Fix race conditions related to driver data + +From: Bart Van Assche + +[ Upstream commit 21ad0e49085deb22c094f91f9da57319a97188e4 ] + +The driver data pointer must be set before any callbacks are registered +that use that pointer. Hence move the initialization of that pointer from +after the ufshcd_init() call to inside ufshcd_init(). + +Link: https://lore.kernel.org/r/20211203231950.193369-7-bvanassche@acm.org +Fixes: 3b1d05807a9a ("[SCSI] ufs: Segregate PCI Specific Code") +Reported-by: Alexey Dobriyan +Tested-by: Bean Huo +Reviewed-by: Bean Huo +Signed-off-by: Bart Van Assche +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 - + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 -- + drivers/scsi/ufs/ufshcd.c | 7 +++++++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/ufs/tc-dwc-g210-pci.c b/drivers/scsi/ufs/tc-dwc-g210-pci.c +index 325d5e14fc0d8..a8b50fc1960d1 100644 +--- a/drivers/scsi/ufs/tc-dwc-g210-pci.c ++++ b/drivers/scsi/ufs/tc-dwc-g210-pci.c +@@ -138,7 +138,6 @@ tc_dwc_g210_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) + return err; + } + +- pci_set_drvdata(pdev, hba); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_allow(&pdev->dev); + +diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c +index 8992354d4e2c7..6f076ff35dd38 100644 +--- a/drivers/scsi/ufs/ufshcd-pltfrm.c ++++ b/drivers/scsi/ufs/ufshcd-pltfrm.c +@@ -348,8 +348,6 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, + goto dealloc_host; + } + +- platform_set_drvdata(pdev, hba); +- + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + +diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c +index f46fa8a2f6585..694c0fc31fbf7 100644 +--- a/drivers/scsi/ufs/ufshcd.c ++++ b/drivers/scsi/ufs/ufshcd.c +@@ -7904,6 +7904,13 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) + struct Scsi_Host *host = hba->host; + struct device *dev = hba->dev; + ++ /* ++ * dev_set_drvdata() must be called before any callbacks are registered ++ * that use dev_get_drvdata() (frequency scaling, clock scaling, hwmon, ++ * sysfs). ++ */ ++ dev_set_drvdata(dev, hba); ++ + if (!mmio_base) { + dev_err(hba->dev, + "Invalid memory reference for mmio_base is NULL\n"); +-- +2.34.1 + diff --git a/queue-4.14/serial-amba-pl011-do-not-request-memory-region-twice.patch b/queue-4.14/serial-amba-pl011-do-not-request-memory-region-twice.patch new file mode 100644 index 00000000000..23de5bcac36 --- /dev/null +++ b/queue-4.14/serial-amba-pl011-do-not-request-memory-region-twice.patch @@ -0,0 +1,106 @@ +From aea567ca348f86a00087f37be82c6c19116e66d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Nov 2021 18:42:38 +0100 +Subject: serial: amba-pl011: do not request memory region twice +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Lino Sanfilippo + +[ Upstream commit d1180405c7b5c7a1c6bde79d5fc24fe931430737 ] + +With commit 3873e2d7f63a ("drivers: PL011: refactor pl011_probe()") the +function devm_ioremap() called from pl011_setup_port() was replaced with +devm_ioremap_resource(). Since this function not only remaps but also +requests the ports io memory region it now collides with the .config_port() +callback which requests the same region at uart port registration. + +Since devm_ioremap_resource() already claims the memory successfully, the +request in .config_port() fails. + +Later at uart port deregistration the attempt to release the unclaimed +memory also fails. The failure results in a “Trying to free nonexistent +resource" warning. + +Fix these issues by removing the callbacks that implement the redundant +memory allocation/release. Also make sure that changing the drivers io +memory base address via TIOCSSERIAL is not allowed any more. + +Fixes: 3873e2d7f63a ("drivers: PL011: refactor pl011_probe()") +Signed-off-by: Lino Sanfilippo +Link: https://lore.kernel.org/r/20211129174238.8333-1-LinoSanfilippo@gmx.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/amba-pl011.c | 27 +++------------------------ + 1 file changed, 3 insertions(+), 24 deletions(-) + +diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c +index dcf84d5020c65..a9aa8cd7f29c8 100644 +--- a/drivers/tty/serial/amba-pl011.c ++++ b/drivers/tty/serial/amba-pl011.c +@@ -2111,32 +2111,13 @@ static const char *pl011_type(struct uart_port *port) + return uap->port.type == PORT_AMBA ? uap->type : NULL; + } + +-/* +- * Release the memory region(s) being used by 'port' +- */ +-static void pl011_release_port(struct uart_port *port) +-{ +- release_mem_region(port->mapbase, SZ_4K); +-} +- +-/* +- * Request the memory region(s) being used by 'port' +- */ +-static int pl011_request_port(struct uart_port *port) +-{ +- return request_mem_region(port->mapbase, SZ_4K, "uart-pl011") +- != NULL ? 0 : -EBUSY; +-} +- + /* + * Configure/autoconfigure the port. + */ + static void pl011_config_port(struct uart_port *port, int flags) + { +- if (flags & UART_CONFIG_TYPE) { ++ if (flags & UART_CONFIG_TYPE) + port->type = PORT_AMBA; +- pl011_request_port(port); +- } + } + + /* +@@ -2151,6 +2132,8 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser) + ret = -EINVAL; + if (ser->baud_base < 9600) + ret = -EINVAL; ++ if (port->mapbase != (unsigned long) ser->iomem_base) ++ ret = -EINVAL; + return ret; + } + +@@ -2168,8 +2151,6 @@ static const struct uart_ops amba_pl011_pops = { + .flush_buffer = pl011_dma_flush_buffer, + .set_termios = pl011_set_termios, + .type = pl011_type, +- .release_port = pl011_release_port, +- .request_port = pl011_request_port, + .config_port = pl011_config_port, + .verify_port = pl011_verify_port, + #ifdef CONFIG_CONSOLE_POLL +@@ -2199,8 +2180,6 @@ static const struct uart_ops sbsa_uart_pops = { + .shutdown = sbsa_uart_shutdown, + .set_termios = sbsa_uart_set_termios, + .type = pl011_type, +- .release_port = pl011_release_port, +- .request_port = pl011_request_port, + .config_port = pl011_config_port, + .verify_port = pl011_verify_port, + #ifdef CONFIG_CONSOLE_POLL +-- +2.34.1 + diff --git a/queue-4.14/serial-core-keep-mctrl-register-state-and-cached-cop.patch b/queue-4.14/serial-core-keep-mctrl-register-state-and-cached-cop.patch new file mode 100644 index 00000000000..ecb8160a63a --- /dev/null +++ b/queue-4.14/serial-core-keep-mctrl-register-state-and-cached-cop.patch @@ -0,0 +1,53 @@ +From f9246aec5500c1515f41f516e86a6688b42cad86 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Jan 2022 18:52:44 +0100 +Subject: serial: core: Keep mctrl register state and cached copy in sync + +From: Lukas Wunner + +[ Upstream commit 93a770b7e16772530196674ffc79bb13fa927dc6 ] + +struct uart_port contains a cached copy of the Modem Control signals. +It is used to skip register writes in uart_update_mctrl() if the new +signal state equals the old signal state. It also avoids a register +read to obtain the current state of output signals. + +When a uart_port is registered, uart_configure_port() changes signal +state but neglects to keep the cached copy in sync. That may cause +a subsequent register write to be incorrectly skipped. Fix it before +it trips somebody up. + +This behavior has been present ever since the serial core was introduced +in 2002: +https://git.kernel.org/history/history/c/33c0d1b0c3eb + +So far it was never an issue because the cached copy is initialized to 0 +by kzalloc() and when uart_configure_port() is executed, at most DTR has +been set by uart_set_options() or sunsu_console_setup(). Therefore, +a stable designation seems unnecessary. + +Signed-off-by: Lukas Wunner +Link: https://lore.kernel.org/r/bceeaba030b028ed810272d55d5fc6f3656ddddb.1641129752.git.lukas@wunner.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/serial_core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c +index 16ce187390d8b..5f9a52883bc05 100644 +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -2361,7 +2361,8 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state, + * We probably don't need a spinlock around this, but + */ + spin_lock_irqsave(&port->lock, flags); +- port->ops->set_mctrl(port, port->mctrl & TIOCM_DTR); ++ port->mctrl &= TIOCM_DTR; ++ port->ops->set_mctrl(port, port->mctrl); + spin_unlock_irqrestore(&port->lock, flags); + + /* +-- +2.34.1 + diff --git a/queue-4.14/serial-pl010-drop-cr-register-reset-on-set_termios.patch b/queue-4.14/serial-pl010-drop-cr-register-reset-on-set_termios.patch new file mode 100644 index 00000000000..9c6fbdedc9e --- /dev/null +++ b/queue-4.14/serial-pl010-drop-cr-register-reset-on-set_termios.patch @@ -0,0 +1,58 @@ +From 62c78a7fe708134892ceedf5945043e23df8a537 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 2 Jan 2022 18:42:44 +0100 +Subject: serial: pl010: Drop CR register reset on set_termios + +From: Lukas Wunner + +[ Upstream commit 08a0c6dff91c965e39905cf200d22db989203ccb ] + +pl010_set_termios() briefly resets the CR register to zero. + +Where does this register write come from? + +The PL010 driver's IRQ handler ambauart_int() originally modified the CR +register without holding the port spinlock. ambauart_set_termios() also +modified that register. To prevent concurrent read-modify-writes by the +IRQ handler and to prevent transmission while changing baudrate, +ambauart_set_termios() had to disable interrupts. That is achieved by +writing zero to the CR register. + +However in 2004 the PL010 driver was amended to acquire the port +spinlock in the IRQ handler, obviating the need to disable interrupts in +->set_termios(): +https://git.kernel.org/history/history/c/157c0342e591 + +That rendered the CR register write obsolete. Drop it. + +Cc: Russell King +Signed-off-by: Lukas Wunner +Link: https://lore.kernel.org/r/fcaff16e5b1abb4cc3da5a2879ac13f278b99ed0.1641128728.git.lukas@wunner.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/amba-pl010.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c +index 9ec4b8d2879f7..0698fbf3b6d61 100644 +--- a/drivers/tty/serial/amba-pl010.c ++++ b/drivers/tty/serial/amba-pl010.c +@@ -465,14 +465,11 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios, + if ((termios->c_cflag & CREAD) == 0) + uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX; + +- /* first, disable everything */ + old_cr = readb(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE; + + if (UART_ENABLE_MS(port, termios->c_cflag)) + old_cr |= UART010_CR_MSIE; + +- writel(0, uap->port.membase + UART010_CR); +- + /* Set baud rate */ + quot -= 1; + writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM); +-- +2.34.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 8715a7391df..8dd654db0c3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -30,3 +30,118 @@ media-stk1160-fix-control-message-timeouts.patch can-softing_cs-softingcs_probe-fix-memleak-on-registration-failure.patch iio-trigger-fix-a-scheduling-whilst-atomic-issue-seen-on-tsc2046.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9125-sata-controller.patch +bluetooth-cmtp-fix-possible-panic-when-cmtp_init_soc.patch +clk-bcm-2835-pick-the-closest-clock-rate.patch +clk-bcm-2835-remove-rounding-up-the-dividers.patch +wcn36xx-indicate-beacon-not-connection-loss-on-misse.patch +media-em28xx-fix-memory-leak-in-em28xx_init_dev.patch +bluetooth-stop-proccessing-malicious-adv-data.patch +media-dmxdev-fix-uaf-when-dvb_register_device-fails.patch +crypto-qce-fix-uaf-on-qce_ahash_register_one.patch +tty-serial-atmel-check-return-code-of-dmaengine_subm.patch +tty-serial-atmel-call-dma_async_issue_pending.patch +media-mtk-vcodec-call-v4l2_m2m_ctx_release-first-whe.patch +netfilter-bridge-add-support-for-pppoe-filtering.patch +arm64-dts-qcom-msm8916-fix-mmc-controller-aliases.patch +drm-amdgpu-fix-a-null-pointer-dereference-in-amdgpu_.patch +drm-radeon-radeon_kms-fix-a-null-pointer-dereference.patch +serial-amba-pl011-do-not-request-memory-region-twice.patch +floppy-fix-hang-in-watchdog-when-disk-is-ejected.patch +media-dib8000-fix-a-memleak-in-dib8000_init.patch +media-saa7146-mxb-fix-a-null-pointer-dereference-in-.patch +media-si2157-fix-warm-tuner-state-detection.patch +sched-rt-try-to-restart-rt-period-timer-when-rt-runt.patch +media-dw2102-fix-use-after-free.patch +media-msi001-fix-possible-null-ptr-deref-in-msi001_p.patch +usb-ftdi-elan-fix-memory-leak-on-device-disconnect.patch +x86-mce-inject-avoid-out-of-bounds-write-when-settin.patch +pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch +pcmcia-rsrc_nonstatic-fix-a-null-pointer-dereference.patch-8110 +ppp-ensure-minimum-packet-size-in-ppp_write.patch +fsl-fman-check-for-null-pointer-after-calling-devm_i.patch +spi-spi-meson-spifc-add-missing-pm_runtime_disable-i.patch +tpm-add-request_locality-before-write-tpm_int_enable.patch +can-softing-softing_startstop-fix-set-but-not-used-v.patch +can-xilinx_can-xcan_probe-check-for-error-irq.patch +pcmcia-fix-setting-of-kthread-task-states.patch +net-mcs7830-handle-usb-read-errors-properly.patch +ext4-avoid-trim-error-on-fs-with-small-groups.patch +alsa-jack-add-missing-rwsem-around-snd_ctl_remove-ca.patch +alsa-pcm-add-missing-rwsem-around-snd_ctl_remove-cal.patch +alsa-hda-add-missing-rwsem-around-snd_ctl_remove-cal.patch +rdma-hns-validate-the-pkey-index.patch +powerpc-prom_init-fix-improper-check-of-prom_getprop.patch +alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch +char-mwave-adjust-io-port-register-size.patch +uio-uio_dmem_genirq-catch-the-exception.patch +scsi-ufs-fix-race-conditions-related-to-driver-data.patch +rdma-core-let-ib_find_gid-continue-search-even-after.patch +dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch +iommu-iova-fix-race-between-fq-timeout-and-teardown.patch +asoc-samsung-idma-check-of-ioremap-return-value.patch +misc-lattice-ecp3-config-fix-task-hung-when-firmware.patch +mips-lantiq-add-support-for-clk_set_parent.patch +mips-bcm63xx-add-support-for-clk_set_parent.patch +rdma-cxgb4-set-queue-pair-state-when-being-queried.patch +bluetooth-fix-debugfs-entry-leak-in-hci_register_dev.patch +fs-dlm-filter-user-dlm-messages-for-kernel-locks.patch +ar5523-fix-null-ptr-deref-with-unexpected-wdcmsg_tar.patch +drm-nouveau-pmu-gm200-avoid-touching-pmu-outside-of-.patch +usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch +hid-apple-do-not-reset-quirks-when-the-fn-key-is-not.patch +media-b2c2-add-missing-check-in-flexcop_pci_isr.patch +arm-imx-rename-debug_imx21_imx27_uart-to-debug_imx27.patch +mlxsw-pci-add-shutdown-method-in-pci-driver.patch +drm-bridge-megachips-ensure-both-bridges-are-probed-.patch +gpiolib-acpi-do-not-set-the-irq-type-if-the-irq-is-a.patch +hsi-core-fix-return-freed-object-in-hsi_new_client.patch +mwifiex-fix-skb_over_panic-in-mwifiex_usb_recv.patch +usb-uhci-add-aspeed-ast2600-uhci-support.patch +floppy-add-max-size-check-for-user-space-request.patch +media-uvcvideo-increase-uvc_ctrl_control_timeout-to-.patch +media-saa7146-hexium_orion-fix-a-null-pointer-derefe.patch +media-m920x-don-t-use-stack-on-usb-reads.patch +iwlwifi-mvm-synchronize-with-fw-after-multicast-comm.patch +ath10k-fix-tx-hanging.patch +net-bonding-debug-avoid-printing-debug-logs-when-bon.patch +bpf-do-not-warn-in-bpf_warn_invalid_xdp_action.patch +media-igorplugusb-receiver-overflow-should-be-report.patch +media-saa7146-hexium_gemini-fix-a-null-pointer-deref.patch +mmc-core-fixup-storing-of-ocr-for-mmc_quirk_nonstd_s.patch +arm64-tegra-adjust-length-of-ccplex-cluster-mmio-reg.patch +usb-hub-add-delay-for-superspeed-hub-resume-to-let-l.patch +ath9k-fix-out-of-bound-memcpy-in-ath9k_hif_usb_rx_st.patch +iwlwifi-fix-leaks-bad-data-after-failed-firmware-loa.patch +iwlwifi-remove-module-loading-failure-message.patch +um-registers-rename-function-names-to-avoid-conflict.patch +jffs2-gc-deadlock-reading-a-page-that-is-used-in-jff.patch +acpica-actypes.h-expand-the-acpi_access_-definitions.patch +acpica-utilities-avoid-deleting-the-same-object-twic.patch +acpica-executer-fix-the-refclass_refof-case-in-acpi_.patch +acpica-hardware-do-not-flush-cpu-cache-when-entering.patch +btrfs-remove-bug_on-in-find_parent_nodes.patch +btrfs-remove-bug_on-eie-in-find_parent_nodes.patch +net-mdio-demote-probed-message-to-debug-print.patch +mac80211-allow-non-standard-vht-mcs-10-11.patch +dm-btree-add-a-defensive-bounds-check-to-insert_at.patch +dm-space-map-common-add-bounds-check-to-sm_ll_lookup.patch +net-phy-marvell-configure-rgmii-delays-for-88e1118.patch +serial-pl010-drop-cr-register-reset-on-set_termios.patch +serial-core-keep-mctrl-register-state-and-cached-cop.patch +parisc-avoid-calling-faulthandler_disabled-twice.patch +powerpc-6xx-add-missing-of_node_put.patch +powerpc-powernv-add-missing-of_node_put.patch +powerpc-cell-add-missing-of_node_put.patch +powerpc-btext-add-missing-of_node_put.patch +powerpc-watchdog-fix-missed-watchdog-reset-due-to-me.patch +i2c-i801-don-t-silently-correct-invalid-transfer-siz.patch +powerpc-smp-move-setup_profiling_timer-under-config_.patch +i2c-mpc-correct-i2c-reset-procedure.patch +w1-misuse-of-get_user-put_user-reported-by-sparse.patch +alsa-seq-set-upper-limit-of-processed-events.patch +mips-octeon-add-put_device-after-of_find_device_by_n.patch +i2c-designware-pci-fix-to-change-data-types-of-hcnt-.patch +mips-octeon-fix-build-errors-using-clang.patch +scsi-sr-don-t-use-gfp_dma.patch +asoc-mediatek-mt8173-fix-device_node-leak.patch +power-bq25890-enable-continuous-conversion-for-adc-a.patch diff --git a/queue-4.14/spi-spi-meson-spifc-add-missing-pm_runtime_disable-i.patch b/queue-4.14/spi-spi-meson-spifc-add-missing-pm_runtime_disable-i.patch new file mode 100644 index 00000000000..4d431c67182 --- /dev/null +++ b/queue-4.14/spi-spi-meson-spifc-add-missing-pm_runtime_disable-i.patch @@ -0,0 +1,38 @@ +From 42e46cf07d3cf9b5f9acc65b7e620c5f38518c7e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Jan 2022 07:54:24 +0000 +Subject: spi: spi-meson-spifc: Add missing pm_runtime_disable() in + meson_spifc_probe + +From: Miaoqian Lin + +[ Upstream commit 69c1b87516e327a60b39f96b778fe683259408bf ] + +If the probe fails, we should use pm_runtime_disable() to balance +pm_runtime_enable(). +Add missing pm_runtime_disable() for meson_spifc_probe. + +Fixes: c3e4bc5434d2 ("spi: meson: Add support for Amlogic Meson SPIFC") +Signed-off-by: Miaoqian Lin +Link: https://lore.kernel.org/r/20220107075424.7774-1-linmq006@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-meson-spifc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c +index 616566e793c62..28975b6f054fa 100644 +--- a/drivers/spi/spi-meson-spifc.c ++++ b/drivers/spi/spi-meson-spifc.c +@@ -357,6 +357,7 @@ static int meson_spifc_probe(struct platform_device *pdev) + return 0; + out_clk: + clk_disable_unprepare(spifc->clk); ++ pm_runtime_disable(spifc->dev); + out_err: + spi_master_put(master); + return ret; +-- +2.34.1 + diff --git a/queue-4.14/tpm-add-request_locality-before-write-tpm_int_enable.patch b/queue-4.14/tpm-add-request_locality-before-write-tpm_int_enable.patch new file mode 100644 index 00000000000..cd138e226c9 --- /dev/null +++ b/queue-4.14/tpm-add-request_locality-before-write-tpm_int_enable.patch @@ -0,0 +1,44 @@ +From 7e46b1d6b2739bf195b3480ec02f05743ae5b7bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Oct 2021 06:25:56 +0000 +Subject: tpm: add request_locality before write TPM_INT_ENABLE + +From: Chen Jun + +[ Upstream commit 0ef333f5ba7f24f5d8478425c163d3097f1c7afd ] + +Locality is not appropriately requested before writing the int mask. +Add the missing boilerplate. + +Fixes: e6aef069b6e9 ("tpm_tis: convert to using locality callbacks") +Signed-off-by: Chen Jun +Reviewed-by: Jarkko Sakkinen +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Sasha Levin +--- + drivers/char/tpm/tpm_tis_core.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c +index 1ac9abcdad52a..9e42943f6a599 100644 +--- a/drivers/char/tpm/tpm_tis_core.c ++++ b/drivers/char/tpm/tpm_tis_core.c +@@ -809,7 +809,15 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, + intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | + TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; + intmask &= ~TPM_GLOBAL_INT_ENABLE; ++ ++ rc = request_locality(chip, 0); ++ if (rc < 0) { ++ rc = -ENODEV; ++ goto out_err; ++ } ++ + tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask); ++ release_locality(chip, 0); + + rc = tpm2_probe(chip); + if (rc) +-- +2.34.1 + diff --git a/queue-4.14/tty-serial-atmel-call-dma_async_issue_pending.patch b/queue-4.14/tty-serial-atmel-call-dma_async_issue_pending.patch new file mode 100644 index 00000000000..1614bb14554 --- /dev/null +++ b/queue-4.14/tty-serial-atmel-call-dma_async_issue_pending.patch @@ -0,0 +1,50 @@ +From e75f0e60b92d863c3dbb28f360fe3f814f0e13b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Nov 2021 11:00:18 +0200 +Subject: tty: serial: atmel: Call dma_async_issue_pending() + +From: Tudor Ambarus + +[ Upstream commit 4f4b9b5895614eb2e2b5f4cab7858f44bd113e1b ] + +The driver wrongly assummed that tx_submit() will start the transfer, +which is not the case, now that the at_xdmac driver is fixed. tx_submit +is supposed to push the current transaction descriptor to a pending queue, +waiting for issue_pending to be called. issue_pending must start the +transfer, not tx_submit. + +Fixes: 34df42f59a60 ("serial: at91: add rx dma support") +Fixes: 08f738be88bb ("serial: at91: add tx dma support") +Signed-off-by: Tudor Ambarus +Link: https://lore.kernel.org/r/20211125090028.786832-4-tudor.ambarus@microchip.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/atmel_serial.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c +index 9a56b88df95f8..4da5604d7385a 100644 +--- a/drivers/tty/serial/atmel_serial.c ++++ b/drivers/tty/serial/atmel_serial.c +@@ -930,6 +930,8 @@ static void atmel_tx_dma(struct uart_port *port) + atmel_port->cookie_tx); + return; + } ++ ++ dma_async_issue_pending(chan); + } + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) +@@ -1194,6 +1196,8 @@ static int atmel_prepare_rx_dma(struct uart_port *port) + goto chan_err; + } + ++ dma_async_issue_pending(atmel_port->chan_rx); ++ + return 0; + + chan_err: +-- +2.34.1 + diff --git a/queue-4.14/tty-serial-atmel-check-return-code-of-dmaengine_subm.patch b/queue-4.14/tty-serial-atmel-check-return-code-of-dmaengine_subm.patch new file mode 100644 index 00000000000..704f22c37a2 --- /dev/null +++ b/queue-4.14/tty-serial-atmel-check-return-code-of-dmaengine_subm.patch @@ -0,0 +1,59 @@ +From 5544fa31d01e479161b59ef6b99e57301121ad4e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Nov 2021 11:00:17 +0200 +Subject: tty: serial: atmel: Check return code of dmaengine_submit() + +From: Tudor Ambarus + +[ Upstream commit 1e67bd2b8cb90b66e89562598e9c2046246832d3 ] + +The tx_submit() method of struct dma_async_tx_descriptor is entitled +to do sanity checks and return errors if encountered. It's not the +case for the DMA controller drivers that this client is using +(at_h/xdmac), because they currently don't do sanity checks and always +return a positive cookie at tx_submit() method. In case the controller +drivers will implement sanity checks and return errors, print a message +so that the client will be informed that something went wrong at +tx_submit() level. + +Fixes: 08f738be88bb ("serial: at91: add tx dma support") +Signed-off-by: Tudor Ambarus +Acked-by: Richard Genoud +Link: https://lore.kernel.org/r/20211125090028.786832-3-tudor.ambarus@microchip.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/atmel_serial.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c +index a00227d312d3f..9a56b88df95f8 100644 +--- a/drivers/tty/serial/atmel_serial.c ++++ b/drivers/tty/serial/atmel_serial.c +@@ -925,6 +925,11 @@ static void atmel_tx_dma(struct uart_port *port) + desc->callback = atmel_complete_tx_dma; + desc->callback_param = atmel_port; + atmel_port->cookie_tx = dmaengine_submit(desc); ++ if (dma_submit_error(atmel_port->cookie_tx)) { ++ dev_err(port->dev, "dma_submit_error %d\n", ++ atmel_port->cookie_tx); ++ return; ++ } + } + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) +@@ -1183,6 +1188,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) + desc->callback_param = port; + atmel_port->desc_rx = desc; + atmel_port->cookie_rx = dmaengine_submit(desc); ++ if (dma_submit_error(atmel_port->cookie_rx)) { ++ dev_err(port->dev, "dma_submit_error %d\n", ++ atmel_port->cookie_rx); ++ goto chan_err; ++ } + + return 0; + +-- +2.34.1 + diff --git a/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch new file mode 100644 index 00000000000..350fdecd8d5 --- /dev/null +++ b/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch @@ -0,0 +1,41 @@ +From 4bc32416d5846cd331ad44a817318ac88a8eca6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Dec 2021 08:03:26 +0800 +Subject: uio: uio_dmem_genirq: Catch the Exception + +From: Jiasheng Jiang + +[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] + +The return value of dma_set_coherent_mask() is not always 0. +To catch the exception in case that dma is not support the mask. + +Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") +Signed-off-by: Jiasheng Jiang +Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/uio/uio_dmem_genirq.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c +index a00b4aee6c799..a31b9d5260ca0 100644 +--- a/drivers/uio/uio_dmem_genirq.c ++++ b/drivers/uio/uio_dmem_genirq.c +@@ -194,7 +194,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) + goto bad0; + } + +- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); ++ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); ++ if (ret) { ++ dev_err(&pdev->dev, "DMA enable failed\n"); ++ return ret; ++ } + + priv->uioinfo = uioinfo; + spin_lock_init(&priv->lock); +-- +2.34.1 + diff --git a/queue-4.14/um-registers-rename-function-names-to-avoid-conflict.patch b/queue-4.14/um-registers-rename-function-names-to-avoid-conflict.patch new file mode 100644 index 00000000000..8ad9ac58af4 --- /dev/null +++ b/queue-4.14/um-registers-rename-function-names-to-avoid-conflict.patch @@ -0,0 +1,104 @@ +From 72bbeed18fa03b70992434be5842e95c8a6aaec3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Sep 2021 23:12:52 -0700 +Subject: um: registers: Rename function names to avoid conflicts and build + problems + +From: Randy Dunlap + +[ Upstream commit 077b7320942b64b0da182aefd83c374462a65535 ] + +The function names init_registers() and restore_registers() are used +in several net/ethernet/ and gpu/drm/ drivers for other purposes (not +calls to UML functions), so rename them. + +This fixes multiple build errors. + +Signed-off-by: Randy Dunlap +Cc: Jeff Dike +Cc: Richard Weinberger +Cc: Anton Ivanov +Cc: linux-um@lists.infradead.org +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + arch/um/include/shared/registers.h | 4 ++-- + arch/um/os-Linux/registers.c | 4 ++-- + arch/um/os-Linux/start_up.c | 2 +- + arch/x86/um/syscalls_64.c | 3 ++- + 4 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/arch/um/include/shared/registers.h b/arch/um/include/shared/registers.h +index a74449b5b0e31..12ad7c435e97f 100644 +--- a/arch/um/include/shared/registers.h ++++ b/arch/um/include/shared/registers.h +@@ -16,8 +16,8 @@ extern int restore_fp_registers(int pid, unsigned long *fp_regs); + extern int save_fpx_registers(int pid, unsigned long *fp_regs); + extern int restore_fpx_registers(int pid, unsigned long *fp_regs); + extern int save_registers(int pid, struct uml_pt_regs *regs); +-extern int restore_registers(int pid, struct uml_pt_regs *regs); +-extern int init_registers(int pid); ++extern int restore_pid_registers(int pid, struct uml_pt_regs *regs); ++extern int init_pid_registers(int pid); + extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs); + extern unsigned long get_thread_reg(int reg, jmp_buf *buf); + extern int get_fp_registers(int pid, unsigned long *regs); +diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c +index 2ff8d4fe83c4f..34a5963bd7efd 100644 +--- a/arch/um/os-Linux/registers.c ++++ b/arch/um/os-Linux/registers.c +@@ -21,7 +21,7 @@ int save_registers(int pid, struct uml_pt_regs *regs) + return 0; + } + +-int restore_registers(int pid, struct uml_pt_regs *regs) ++int restore_pid_registers(int pid, struct uml_pt_regs *regs) + { + int err; + +@@ -36,7 +36,7 @@ int restore_registers(int pid, struct uml_pt_regs *regs) + static unsigned long exec_regs[MAX_REG_NR]; + static unsigned long exec_fp_regs[FP_SIZE]; + +-int init_registers(int pid) ++int init_pid_registers(int pid) + { + int err; + +diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c +index 82bf5f8442ba4..2c75f2d638681 100644 +--- a/arch/um/os-Linux/start_up.c ++++ b/arch/um/os-Linux/start_up.c +@@ -336,7 +336,7 @@ void __init os_early_checks(void) + check_tmpexec(); + + pid = start_ptraced_child(); +- if (init_registers(pid)) ++ if (init_pid_registers(pid)) + fatal("Failed to initialize default registers"); + stop_ptraced_child(pid, 1, 1); + } +diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c +index 58f51667e2e4b..8249685b40960 100644 +--- a/arch/x86/um/syscalls_64.c ++++ b/arch/x86/um/syscalls_64.c +@@ -11,6 +11,7 @@ + #include + #include /* XXX This should get the constants from libc */ + #include ++#include + + long arch_prctl(struct task_struct *task, int option, + unsigned long __user *arg2) +@@ -35,7 +36,7 @@ long arch_prctl(struct task_struct *task, int option, + switch (option) { + case ARCH_SET_FS: + case ARCH_SET_GS: +- ret = restore_registers(pid, ¤t->thread.regs.regs); ++ ret = restore_pid_registers(pid, ¤t->thread.regs.regs); + if (ret) + return ret; + break; +-- +2.34.1 + diff --git a/queue-4.14/usb-ftdi-elan-fix-memory-leak-on-device-disconnect.patch b/queue-4.14/usb-ftdi-elan-fix-memory-leak-on-device-disconnect.patch new file mode 100644 index 00000000000..8d11556eb88 --- /dev/null +++ b/queue-4.14/usb-ftdi-elan-fix-memory-leak-on-device-disconnect.patch @@ -0,0 +1,52 @@ +From 32572dff659cd97b969a5fcc640af02963a72d5a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Dec 2021 16:34:28 +0800 +Subject: usb: ftdi-elan: fix memory leak on device disconnect + +From: Wei Yongjun + +[ Upstream commit 1646566b5e0c556f779180a8514e521ac735de1e ] + +'ftdi' is alloced when probe device, but not free on device disconnect, +this cause a memory leak as follows: + +unreferenced object 0xffff88800d584000 (size 8400): + comm "kworker/0:2", pid 3809, jiffies 4295453055 (age 13.784s) + hex dump (first 32 bytes): + 00 40 58 0d 80 88 ff ff 00 40 58 0d 80 88 ff ff .@X......@X..... + 00 00 00 00 00 00 00 00 00 00 00 00 ad 4e ad de .............N.. + backtrace: + [<000000000d47f947>] kmalloc_order_trace+0x19/0x110 mm/slab_common.c:960 + [<000000008548ac68>] ftdi_elan_probe+0x8c/0x880 drivers/usb/misc/ftdi-elan.c:2647 + [<000000007f73e422>] usb_probe_interface+0x31b/0x800 drivers/usb/core/driver.c:396 + [<00000000fe8d07fc>] really_probe+0x299/0xc30 drivers/base/dd.c:517 + [<0000000005da7d32>] __driver_probe_device+0x357/0x500 drivers/base/dd.c:751 + [<000000003c2c9579>] driver_probe_device+0x4e/0x140 drivers/base/dd.c:781 + +Fix it by freeing 'ftdi' after nobody use it. + +Fixes: a5c66e4b2418 ("USB: ftdi-elan: client driver for ELAN Uxxx adapters") +Reported-by: Hulk Robot +Signed-off-by: Wei Yongjun +Link: https://lore.kernel.org/r/20211217083428.2441-1-weiyongjun1@huawei.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/misc/ftdi-elan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c +index 424ff12f3b51f..0231c0cc6481d 100644 +--- a/drivers/usb/misc/ftdi-elan.c ++++ b/drivers/usb/misc/ftdi-elan.c +@@ -206,6 +206,7 @@ static void ftdi_elan_delete(struct kref *kref) + mutex_unlock(&ftdi_module_lock); + kfree(ftdi->bulk_in_buffer); + ftdi->bulk_in_buffer = NULL; ++ kfree(ftdi); + } + + static void ftdi_elan_put_kref(struct usb_ftdi *ftdi) +-- +2.34.1 + diff --git a/queue-4.14/usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch b/queue-4.14/usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch new file mode 100644 index 00000000000..7cc4dd888d8 --- /dev/null +++ b/queue-4.14/usb-gadget-f_fs-use-stream_open-for-endpoint-files.patch @@ -0,0 +1,65 @@ +From 74e30125be932633ab964f403cd22e8910b85c3c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Nov 2021 15:54:40 +0530 +Subject: usb: gadget: f_fs: Use stream_open() for endpoint files + +From: Pavankumar Kondeti + +[ Upstream commit c76ef96fc00eb398c8fc836b0eb2f82bcc619dc7 ] + +Function fs endpoint file operations are synchronized via an interruptible +mutex wait. However we see threads that do ep file operations concurrently +are getting blocked for the mutex lock in __fdget_pos(). This is an +uninterruptible wait and we see hung task warnings and kernel panic +if hung_task_panic systcl is enabled if host does not send/receive +the data for long time. + +The reason for threads getting blocked in __fdget_pos() is due to +the file position protection introduced by the commit 9c225f2655e3 +("vfs: atomic f_pos accesses as per POSIX"). Since function fs +endpoint files does not have the notion of the file position, switch +to the stream mode. This will bypass the file position mutex and +threads will be blocked in interruptible state for the function fs +mutex. + +It should not affects user space as we are only changing the task state +changes the task state from UNINTERRUPTIBLE to INTERRUPTIBLE while waiting +for the USB transfers to be finished. However there is a slight change to +the O_NONBLOCK behavior. Earlier threads that are using O_NONBLOCK are also +getting blocked inside fdget_pos(). Now they reach to function fs and error +code is returned. The non blocking behavior is actually honoured now. + +Reviewed-by: John Keeping +Signed-off-by: Pavankumar Kondeti +Link: https://lore.kernel.org/r/1636712682-1226-1-git-send-email-quic_pkondeti@quicinc.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_fs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c +index 6029f9b00b4a0..61795025f11b6 100644 +--- a/drivers/usb/gadget/function/f_fs.c ++++ b/drivers/usb/gadget/function/f_fs.c +@@ -608,7 +608,7 @@ static int ffs_ep0_open(struct inode *inode, struct file *file) + file->private_data = ffs; + ffs_data_opened(ffs); + +- return 0; ++ return stream_open(inode, file); + } + + static int ffs_ep0_release(struct inode *inode, struct file *file) +@@ -1072,7 +1072,7 @@ ffs_epfile_open(struct inode *inode, struct file *file) + file->private_data = epfile; + ffs_data_opened(epfile->ffs); + +- return 0; ++ return stream_open(inode, file); + } + + static int ffs_aio_cancel(struct kiocb *kiocb) +-- +2.34.1 + diff --git a/queue-4.14/usb-hub-add-delay-for-superspeed-hub-resume-to-let-l.patch b/queue-4.14/usb-hub-add-delay-for-superspeed-hub-resume-to-let-l.patch new file mode 100644 index 00000000000..bdc36fb9d66 --- /dev/null +++ b/queue-4.14/usb-hub-add-delay-for-superspeed-hub-resume-to-let-l.patch @@ -0,0 +1,97 @@ +From e975afde6659af9b74117242abfc8e3ad3f9abc7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Dec 2021 20:01:06 +0800 +Subject: usb: hub: Add delay for SuperSpeed hub resume to let links transit to + U0 + +From: Kai-Heng Feng + +[ Upstream commit 00558586382891540c59c9febc671062425a6e47 ] + +When a new USB device gets plugged to nested hubs, the affected hub, +which connects to usb 2-1.4-port2, doesn't report there's any change, +hence the nested hubs go back to runtime suspend like nothing happened: +[ 281.032951] usb usb2: usb wakeup-resume +[ 281.032959] usb usb2: usb auto-resume +[ 281.032974] hub 2-0:1.0: hub_resume +[ 281.033011] usb usb2-port1: status 0263 change 0000 +[ 281.033077] hub 2-0:1.0: state 7 ports 4 chg 0000 evt 0000 +[ 281.049797] usb 2-1: usb wakeup-resume +[ 281.069800] usb 2-1: Waited 0ms for CONNECT +[ 281.069810] usb 2-1: finish resume +[ 281.070026] hub 2-1:1.0: hub_resume +[ 281.070250] usb 2-1-port4: status 0203 change 0000 +[ 281.070272] usb usb2-port1: resume, status 0 +[ 281.070282] hub 2-1:1.0: state 7 ports 4 chg 0010 evt 0000 +[ 281.089813] usb 2-1.4: usb wakeup-resume +[ 281.109792] usb 2-1.4: Waited 0ms for CONNECT +[ 281.109801] usb 2-1.4: finish resume +[ 281.109991] hub 2-1.4:1.0: hub_resume +[ 281.110147] usb 2-1.4-port2: status 0263 change 0000 +[ 281.110234] usb 2-1-port4: resume, status 0 +[ 281.110239] usb 2-1-port4: status 0203, change 0000, 10.0 Gb/s +[ 281.110266] hub 2-1.4:1.0: state 7 ports 4 chg 0000 evt 0000 +[ 281.110426] hub 2-1.4:1.0: hub_suspend +[ 281.110565] usb 2-1.4: usb auto-suspend, wakeup 1 +[ 281.130998] hub 2-1:1.0: hub_suspend +[ 281.137788] usb 2-1: usb auto-suspend, wakeup 1 +[ 281.142935] hub 2-0:1.0: state 7 ports 4 chg 0000 evt 0000 +[ 281.177828] usb 2-1: usb wakeup-resume +[ 281.197839] usb 2-1: Waited 0ms for CONNECT +[ 281.197850] usb 2-1: finish resume +[ 281.197984] hub 2-1:1.0: hub_resume +[ 281.198203] usb 2-1-port4: status 0203 change 0000 +[ 281.198228] usb usb2-port1: resume, status 0 +[ 281.198237] hub 2-1:1.0: state 7 ports 4 chg 0010 evt 0000 +[ 281.217835] usb 2-1.4: usb wakeup-resume +[ 281.237834] usb 2-1.4: Waited 0ms for CONNECT +[ 281.237845] usb 2-1.4: finish resume +[ 281.237990] hub 2-1.4:1.0: hub_resume +[ 281.238067] usb 2-1.4-port2: status 0263 change 0000 +[ 281.238148] usb 2-1-port4: resume, status 0 +[ 281.238152] usb 2-1-port4: status 0203, change 0000, 10.0 Gb/s +[ 281.238166] hub 2-1.4:1.0: state 7 ports 4 chg 0000 evt 0000 +[ 281.238385] hub 2-1.4:1.0: hub_suspend +[ 281.238523] usb 2-1.4: usb auto-suspend, wakeup 1 +[ 281.258076] hub 2-1:1.0: hub_suspend +[ 281.265744] usb 2-1: usb auto-suspend, wakeup 1 +[ 281.285976] hub 2-0:1.0: hub_suspend +[ 281.285988] usb usb2: bus auto-suspend, wakeup 1 + +USB 3.2 spec, 9.2.5.4 "Changing Function Suspend State" says that "If +the link is in a non-U0 state, then the device must transition the link +to U0 prior to sending the remote wake message", but the hub only +transits the link to U0 after signaling remote wakeup. + +So be more forgiving and use a 20ms delay to let the link transit to U0 +for remote wakeup. + +Suggested-by: Alan Stern +Acked-by: Alan Stern +Signed-off-by: Kai-Heng Feng +Link: https://lore.kernel.org/r/20211215120108.336597-1-kai.heng.feng@canonical.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/core/hub.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c +index a9a57c88139df..132828b56cf83 100644 +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -1077,7 +1077,10 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) + } else { + hub_power_on(hub, true); + } +- } ++ /* Give some time on remote wakeup to let links to transit to U0 */ ++ } else if (hub_is_superspeed(hub->hdev)) ++ msleep(20); ++ + init2: + + /* +-- +2.34.1 + diff --git a/queue-4.14/usb-uhci-add-aspeed-ast2600-uhci-support.patch b/queue-4.14/usb-uhci-add-aspeed-ast2600-uhci-support.patch new file mode 100644 index 00000000000..4b478c97678 --- /dev/null +++ b/queue-4.14/usb-uhci-add-aspeed-ast2600-uhci-support.patch @@ -0,0 +1,36 @@ +From 84f92fb0aacaf2effbaaa63ea6fca0e9a9b560e0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Nov 2021 18:00:21 +0800 +Subject: usb: uhci: add aspeed ast2600 uhci support + +From: Neal Liu + +[ Upstream commit 554abfe2eadec97d12c71d4a69da1518478f69eb ] + +Enable ast2600 uhci quirks. + +Signed-off-by: Neal Liu +Link: https://lore.kernel.org/r/20211126100021.2331024-1-neal_liu@aspeedtech.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/uhci-platform.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c +index 6cb16d4b22578..4e91f7b21a796 100644 +--- a/drivers/usb/host/uhci-platform.c ++++ b/drivers/usb/host/uhci-platform.c +@@ -113,7 +113,8 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev) + num_ports); + } + if (of_device_is_compatible(np, "aspeed,ast2400-uhci") || +- of_device_is_compatible(np, "aspeed,ast2500-uhci")) { ++ of_device_is_compatible(np, "aspeed,ast2500-uhci") || ++ of_device_is_compatible(np, "aspeed,ast2600-uhci")) { + uhci->is_aspeed = 1; + dev_info(&pdev->dev, + "Enabled Aspeed implementation workarounds\n"); +-- +2.34.1 + diff --git a/queue-4.14/w1-misuse-of-get_user-put_user-reported-by-sparse.patch b/queue-4.14/w1-misuse-of-get_user-put_user-reported-by-sparse.patch new file mode 100644 index 00000000000..20a98866cd8 --- /dev/null +++ b/queue-4.14/w1-misuse-of-get_user-put_user-reported-by-sparse.patch @@ -0,0 +1,86 @@ +From 829a948bf8d4b9406bc83162903ebab8067b96b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Nov 2021 18:06:46 +0100 +Subject: w1: Misuse of get_user()/put_user() reported by sparse + +From: Christophe Leroy + +[ Upstream commit 33dc3e3e99e626ce51f462d883b05856c6c30b1d ] + +sparse warnings: (new ones prefixed by >>) +>> drivers/w1/slaves/w1_ds28e04.c:342:13: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected char [noderef] __user *_pu_addr @@ got char *buf @@ + drivers/w1/slaves/w1_ds28e04.c:342:13: sparse: expected char [noderef] __user *_pu_addr + drivers/w1/slaves/w1_ds28e04.c:342:13: sparse: got char *buf +>> drivers/w1/slaves/w1_ds28e04.c:356:13: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected char const [noderef] __user *_gu_addr @@ got char const *buf @@ + drivers/w1/slaves/w1_ds28e04.c:356:13: sparse: expected char const [noderef] __user *_gu_addr + drivers/w1/slaves/w1_ds28e04.c:356:13: sparse: got char const *buf + +The buffer buf is a failsafe buffer in kernel space, it's not user +memory hence doesn't deserve the use of get_user() or put_user(). + +Access 'buf' content directly. + +Link: https://lore.kernel.org/lkml/202111190526.K5vb7NWC-lkp@intel.com/T/ +Reported-by: kernel test robot +Signed-off-by: Christophe Leroy +Link: https://lore.kernel.org/r/d14ed8d71ad4372e6839ae427f91441d3ba0e94d.1637946316.git.christophe.leroy@csgroup.eu +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/w1/slaves/w1_ds28e04.c | 26 ++++++-------------------- + 1 file changed, 6 insertions(+), 20 deletions(-) + +diff --git a/drivers/w1/slaves/w1_ds28e04.c b/drivers/w1/slaves/w1_ds28e04.c +index ec234b846eb3c..e5eb19a34ee2a 100644 +--- a/drivers/w1/slaves/w1_ds28e04.c ++++ b/drivers/w1/slaves/w1_ds28e04.c +@@ -34,7 +34,7 @@ static int w1_strong_pullup = 1; + module_param_named(strong_pullup, w1_strong_pullup, int, 0); + + /* enable/disable CRC checking on DS28E04-100 memory accesses */ +-static char w1_enable_crccheck = 1; ++static bool w1_enable_crccheck = true; + + #define W1_EEPROM_SIZE 512 + #define W1_PAGE_COUNT 16 +@@ -341,32 +341,18 @@ static BIN_ATTR_RW(pio, 1); + static ssize_t crccheck_show(struct device *dev, struct device_attribute *attr, + char *buf) + { +- if (put_user(w1_enable_crccheck + 0x30, buf)) +- return -EFAULT; +- +- return sizeof(w1_enable_crccheck); ++ return sysfs_emit(buf, "%d\n", w1_enable_crccheck); + } + + static ssize_t crccheck_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) + { +- char val; +- +- if (count != 1 || !buf) +- return -EINVAL; ++ int err = kstrtobool(buf, &w1_enable_crccheck); + +- if (get_user(val, buf)) +- return -EFAULT; ++ if (err) ++ return err; + +- /* convert to decimal */ +- val = val - 0x30; +- if (val != 0 && val != 1) +- return -EINVAL; +- +- /* set the new value */ +- w1_enable_crccheck = val; +- +- return sizeof(w1_enable_crccheck); ++ return count; + } + + static DEVICE_ATTR_RW(crccheck); +-- +2.34.1 + diff --git a/queue-4.14/wcn36xx-indicate-beacon-not-connection-loss-on-misse.patch b/queue-4.14/wcn36xx-indicate-beacon-not-connection-loss-on-misse.patch new file mode 100644 index 00000000000..458393156b7 --- /dev/null +++ b/queue-4.14/wcn36xx-indicate-beacon-not-connection-loss-on-misse.patch @@ -0,0 +1,51 @@ +From 383e210fdd309f6623ec49f6b09f1645b0566ee1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Oct 2021 00:25:29 +0100 +Subject: wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND + +From: Bryan O'Donoghue + +[ Upstream commit 588b45c88ae130fe373a8c50edaf54735c3f4fe3 ] + +Firmware can trigger a missed beacon indication, this is not the same as a +lost signal. + +Flag to Linux the missed beacon and let the WiFi stack decide for itself if +the link is up or down by sending its own probe to determine this. + +We should only be signalling the link is lost when the firmware indicates + +Fixes: 8e84c2582169 ("wcn36xx: mac80211 driver for Qualcomm WCN3660/WCN3680 hardware") +Signed-off-by: Bryan O'Donoghue +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20211027232529.657764-1-bryan.odonoghue@linaro.org +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/wcn36xx/smd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c +index c5b5fbcd2066c..3073c5af7dae8 100644 +--- a/drivers/net/wireless/ath/wcn36xx/smd.c ++++ b/drivers/net/wireless/ath/wcn36xx/smd.c +@@ -2053,7 +2053,7 @@ static int wcn36xx_smd_missed_beacon_ind(struct wcn36xx *wcn, + wcn36xx_dbg(WCN36XX_DBG_HAL, "beacon missed bss_index %d\n", + tmp->bss_index); + vif = wcn36xx_priv_to_vif(tmp); +- ieee80211_connection_loss(vif); ++ ieee80211_beacon_loss(vif); + } + return 0; + } +@@ -2068,7 +2068,7 @@ static int wcn36xx_smd_missed_beacon_ind(struct wcn36xx *wcn, + wcn36xx_dbg(WCN36XX_DBG_HAL, "beacon missed bss_index %d\n", + rsp->bss_index); + vif = wcn36xx_priv_to_vif(tmp); +- ieee80211_connection_loss(vif); ++ ieee80211_beacon_loss(vif); + return 0; + } + } +-- +2.34.1 + diff --git a/queue-4.14/x86-mce-inject-avoid-out-of-bounds-write-when-settin.patch b/queue-4.14/x86-mce-inject-avoid-out-of-bounds-write-when-settin.patch new file mode 100644 index 00000000000..19a1db8d2af --- /dev/null +++ b/queue-4.14/x86-mce-inject-avoid-out-of-bounds-write-when-settin.patch @@ -0,0 +1,55 @@ +From 1232e0c0f9c3afa49ad2c09a9e0e48fc1436fa32 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Dec 2021 22:02:49 +0100 +Subject: x86/mce/inject: Avoid out-of-bounds write when setting flags + +From: Zhang Zixun + +[ Upstream commit de768416b203ac84e02a757b782a32efb388476f ] + +A contrived zero-length write, for example, by using write(2): + + ... + ret = write(fd, str, 0); + ... + +to the "flags" file causes: + + BUG: KASAN: stack-out-of-bounds in flags_write + Write of size 1 at addr ffff888019be7ddf by task writefile/3787 + + CPU: 4 PID: 3787 Comm: writefile Not tainted 5.16.0-rc7+ #12 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 + +due to accessing buf one char before its start. + +Prevent such out-of-bounds access. + + [ bp: Productize into a proper patch. Link below is the next best + thing because the original mail didn't get archived on lore. ] + +Fixes: 0451d14d0561 ("EDAC, mce_amd_inj: Modify flags attribute to use string arguments") +Signed-off-by: Zhang Zixun +Signed-off-by: Borislav Petkov +Link: https://lore.kernel.org/linux-edac/YcnePfF1OOqoQwrX@zn.tnic/ +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c +index 94aa91b09c288..2778b66aee8fc 100644 +--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c ++++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c +@@ -354,7 +354,7 @@ static ssize_t flags_write(struct file *filp, const char __user *ubuf, + char buf[MAX_FLAG_OPT_SIZE], *__buf; + int err; + +- if (cnt > MAX_FLAG_OPT_SIZE) ++ if (!cnt || cnt > MAX_FLAG_OPT_SIZE) + return -EINVAL; + + if (copy_from_user(&buf, ubuf, cnt)) +-- +2.34.1 +