From caed646e2d01dd60194510f3e1ad14bbfadf3f25 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 21 Apr 2020 19:36:12 +0200 Subject: [PATCH] 4.14-stable patches added patches: alsa-hda-don-t-release-card-at-firmware-loading-error.patch irqchip-mbigen-free-msi_desc-on-device-teardown.patch lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch of-unittest-kmemleak-on-changeset-destroy.patch video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch --- ...lease-card-at-firmware-loading-error.patch | 59 ++++++++++++ ...gen-free-msi_desc-on-device-teardown.patch | 43 +++++++++ ...pq_n_u8-to-avoid-endianness-warnings.patch | 90 +++++++++++++++++++ ...upp-on-unsupported-flags-object-type.patch | 41 +++++++++ ...ittest-kmemleak-on-changeset-destroy.patch | 40 +++++++++ queue-4.14/series | 6 ++ ...ssary-parentheses-and-commented-code.patch | 53 +++++++++++ 7 files changed, 332 insertions(+) create mode 100644 queue-4.14/alsa-hda-don-t-release-card-at-firmware-loading-error.patch create mode 100644 queue-4.14/irqchip-mbigen-free-msi_desc-on-device-teardown.patch create mode 100644 queue-4.14/lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch create mode 100644 queue-4.14/netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch create mode 100644 queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch create mode 100644 queue-4.14/video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch diff --git a/queue-4.14/alsa-hda-don-t-release-card-at-firmware-loading-error.patch b/queue-4.14/alsa-hda-don-t-release-card-at-firmware-loading-error.patch new file mode 100644 index 00000000000..3fd39486978 --- /dev/null +++ b/queue-4.14/alsa-hda-don-t-release-card-at-firmware-loading-error.patch @@ -0,0 +1,59 @@ +From 25faa4bd37c10f19e4b848b9032a17a3d44c6f09 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Mon, 13 Apr 2020 10:20:29 +0200 +Subject: ALSA: hda: Don't release card at firmware loading error + +From: Takashi Iwai + +commit 25faa4bd37c10f19e4b848b9032a17a3d44c6f09 upstream. + +At the error path of the firmware loading error, the driver tries to +release the card object and set NULL to drvdata. This may be referred +badly at the possible PM action, as the driver itself is still bound +and the PM callbacks read the card object. + +Instead, we continue the probing as if it were no option set. This is +often a better choice than the forced abort, too. + +Fixes: 5cb543dba986 ("ALSA: hda - Deferred probing with request_firmware_nowait()") +BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207043 +Link: https://lore.kernel.org/r/20200413082034.25166-2-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2034,24 +2034,15 @@ static void azx_firmware_cb(const struct + { + struct snd_card *card = context; + struct azx *chip = card->private_data; +- struct pci_dev *pci = chip->pci; + +- if (!fw) { +- dev_err(card->dev, "Cannot load firmware, aborting\n"); +- goto error; +- } +- +- chip->fw = fw; ++ if (fw) ++ chip->fw = fw; ++ else ++ dev_err(card->dev, "Cannot load firmware, continue without patching\n"); + if (!chip->disabled) { + /* continue probing */ +- if (azx_probe_continue(chip)) +- goto error; ++ azx_probe_continue(chip); + } +- return; /* OK */ +- +- error: +- snd_card_free(card); +- pci_set_drvdata(pci, NULL); + } + #endif + diff --git a/queue-4.14/irqchip-mbigen-free-msi_desc-on-device-teardown.patch b/queue-4.14/irqchip-mbigen-free-msi_desc-on-device-teardown.patch new file mode 100644 index 00000000000..bf9c7bb2878 --- /dev/null +++ b/queue-4.14/irqchip-mbigen-free-msi_desc-on-device-teardown.patch @@ -0,0 +1,43 @@ +From edfc23f6f9fdbd7825d50ac1f380243cde19b679 Mon Sep 17 00:00:00 2001 +From: Zenghui Yu +Date: Wed, 8 Apr 2020 19:43:52 +0800 +Subject: irqchip/mbigen: Free msi_desc on device teardown + +From: Zenghui Yu + +commit edfc23f6f9fdbd7825d50ac1f380243cde19b679 upstream. + +Using irq_domain_free_irqs_common() on the irqdomain free path will +leave the MSI descriptor unfreed when platform devices get removed. +Properly free it by MSI domain free function. + +Fixes: 9650c60ebfec0 ("irqchip/mbigen: Create irq domain for each mbigen device") +Signed-off-by: Zenghui Yu +Signed-off-by: Marc Zyngier +Link: https://lore.kernel.org/r/20200408114352.1604-1-yuzenghui@huawei.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/irqchip/irq-mbigen.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/irqchip/irq-mbigen.c ++++ b/drivers/irqchip/irq-mbigen.c +@@ -231,10 +231,16 @@ static int mbigen_irq_domain_alloc(struc + return 0; + } + ++static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq, ++ unsigned int nr_irqs) ++{ ++ platform_msi_domain_free(domain, virq, nr_irqs); ++} ++ + static const struct irq_domain_ops mbigen_domain_ops = { + .translate = mbigen_domain_translate, + .alloc = mbigen_irq_domain_alloc, +- .free = irq_domain_free_irqs_common, ++ .free = mbigen_irq_domain_free, + }; + + static int mbigen_of_create_domain(struct platform_device *pdev, diff --git a/queue-4.14/lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch b/queue-4.14/lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch new file mode 100644 index 00000000000..d2f3465e966 --- /dev/null +++ b/queue-4.14/lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch @@ -0,0 +1,90 @@ +From 1ad3935b39da78a403e7df7a3813f866c731bc64 Mon Sep 17 00:00:00 2001 +From: "ndesaulniers@google.com" +Date: Mon, 25 Feb 2019 20:03:42 -0800 +Subject: lib/raid6: use vdupq_n_u8 to avoid endianness warnings + +From: ndesaulniers@google.com + +commit 1ad3935b39da78a403e7df7a3813f866c731bc64 upstream. + +Clang warns: vector initializers are not compatible with NEON intrinsics +in big endian mode [-Wnonportable-vector-initialization] + +While this is usually the case, it's not an issue for this case since +we're initializing the uint8x16_t (16x uint8_t's) with the same value. + +Instead, use vdupq_n_u8 which both compilers lower into a single movi +instruction: https://godbolt.org/z/vBrgzt + +This avoids the static storage for a constant value. + +Link: https://github.com/ClangBuiltLinux/linux/issues/214 +Suggested-by: Nathan Chancellor +Reviewed-by: Ard Biesheuvel +Signed-off-by: Nick Desaulniers +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman + +--- + lib/raid6/neon.uc | 5 ++--- + lib/raid6/recov_neon_inner.c | 7 ++----- + 2 files changed, 4 insertions(+), 8 deletions(-) + +--- a/lib/raid6/neon.uc ++++ b/lib/raid6/neon.uc +@@ -28,7 +28,6 @@ + + typedef uint8x16_t unative_t; + +-#define NBYTES(x) ((unative_t){x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}) + #define NSIZE sizeof(unative_t) + + /* +@@ -61,7 +60,7 @@ void raid6_neon$#_gen_syndrome_real(int + int d, z, z0; + + register unative_t wd$$, wq$$, wp$$, w1$$, w2$$; +- const unative_t x1d = NBYTES(0x1d); ++ const unative_t x1d = vdupq_n_u8(0x1d); + + z0 = disks - 3; /* Highest data disk */ + p = dptr[z0+1]; /* XOR parity */ +@@ -92,7 +91,7 @@ void raid6_neon$#_xor_syndrome_real(int + int d, z, z0; + + register unative_t wd$$, wq$$, wp$$, w1$$, w2$$; +- const unative_t x1d = NBYTES(0x1d); ++ const unative_t x1d = vdupq_n_u8(0x1d); + + z0 = stop; /* P/Q right side optimization */ + p = dptr[disks-2]; /* XOR parity */ +--- a/lib/raid6/recov_neon_inner.c ++++ b/lib/raid6/recov_neon_inner.c +@@ -10,11 +10,6 @@ + + #include + +-static const uint8x16_t x0f = { +- 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, +- 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, +-}; +- + #ifdef CONFIG_ARM + /* + * AArch32 does not provide this intrinsic natively because it does not +@@ -41,6 +36,7 @@ void __raid6_2data_recov_neon(int bytes, + uint8x16_t pm1 = vld1q_u8(pbmul + 16); + uint8x16_t qm0 = vld1q_u8(qmul); + uint8x16_t qm1 = vld1q_u8(qmul + 16); ++ uint8x16_t x0f = vdupq_n_u8(0x0f); + + /* + * while ( bytes-- ) { +@@ -87,6 +83,7 @@ void __raid6_datap_recov_neon(int bytes, + { + uint8x16_t qm0 = vld1q_u8(qmul); + uint8x16_t qm1 = vld1q_u8(qmul + 16); ++ uint8x16_t x0f = vdupq_n_u8(0x0f); + + /* + * while (bytes--) { diff --git a/queue-4.14/netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch b/queue-4.14/netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch new file mode 100644 index 00000000000..8ec3af77d45 --- /dev/null +++ b/queue-4.14/netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch @@ -0,0 +1,41 @@ +From d9583cdf2f38d0f526d9a8c8564dd2e35e649bc7 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Tue, 7 Apr 2020 14:10:11 +0200 +Subject: netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type + +From: Pablo Neira Ayuso + +commit d9583cdf2f38d0f526d9a8c8564dd2e35e649bc7 upstream. + +EINVAL should be used for malformed netlink messages. New userspace +utility and old kernels might easily result in EINVAL when exercising +new set features, which is misleading. + +Fixes: 8aeff920dcc9 ("netfilter: nf_tables: add stateful object reference to set elements") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman + +--- + net/netfilter/nf_tables_api.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -3129,7 +3129,7 @@ static int nf_tables_newset(struct net * + NFT_SET_INTERVAL | NFT_SET_TIMEOUT | + NFT_SET_MAP | NFT_SET_EVAL | + NFT_SET_OBJECT)) +- return -EINVAL; ++ return -EOPNOTSUPP; + /* Only one of these operations is supported */ + if ((flags & (NFT_SET_MAP | NFT_SET_OBJECT)) == + (NFT_SET_MAP | NFT_SET_OBJECT)) +@@ -3167,7 +3167,7 @@ static int nf_tables_newset(struct net * + objtype = ntohl(nla_get_be32(nla[NFTA_SET_OBJ_TYPE])); + if (objtype == NFT_OBJECT_UNSPEC || + objtype > NFT_OBJECT_MAX) +- return -EINVAL; ++ return -EOPNOTSUPP; + } else if (flags & NFT_SET_OBJECT) + return -EINVAL; + else diff --git a/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch new file mode 100644 index 00000000000..6cdcf9e7979 --- /dev/null +++ b/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch @@ -0,0 +1,40 @@ +From b3fb36ed694b05738d45218ea72cf7feb10ce2b1 Mon Sep 17 00:00:00 2001 +From: Frank Rowand +Date: Thu, 16 Apr 2020 16:42:46 -0500 +Subject: of: unittest: kmemleak on changeset destroy + +From: Frank Rowand + +commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 upstream. + +kmemleak reports several memory leaks from devicetree unittest. +This is the fix for problem 1 of 5. + +of_unittest_changeset() reaches deeply into the dynamic devicetree +functions. Several nodes were left with an elevated reference +count and thus were not properly cleaned up. Fix the reference +counts so that the memory will be freed. + +Fixes: 201c910bd689 ("of: Transactional DT support.") +Reported-by: Erhard F. +Signed-off-by: Frank Rowand +Signed-off-by: Rob Herring +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/of/unittest.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/of/unittest.c ++++ b/drivers/of/unittest.c +@@ -605,6 +605,10 @@ static void __init of_unittest_changeset + unittest(!of_changeset_revert(&chgset), "revert failed\n"); + + of_changeset_destroy(&chgset); ++ ++ of_node_put(n1); ++ of_node_put(n2); ++ of_node_put(n21); + #endif + } + diff --git a/queue-4.14/series b/queue-4.14/series index 5b53fb82a47..6bab94ea15a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -137,3 +137,9 @@ objtool-fix-switch-table-detection-in-.text.unlikely.patch scsi-sg-add-sg_remove_request-in-sg_common_write.patch ext4-use-non-movable-memory-for-superblock-readahead.patch arm-bpf-fix-bugs-with-alu64-rsh-arsh-bpf_k-shift-by-0.patch +netfilter-nf_tables-report-eopnotsupp-on-unsupported-flags-object-type.patch +irqchip-mbigen-free-msi_desc-on-device-teardown.patch +alsa-hda-don-t-release-card-at-firmware-loading-error.patch +of-unittest-kmemleak-on-changeset-destroy.patch +lib-raid6-use-vdupq_n_u8-to-avoid-endianness-warnings.patch +video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch diff --git a/queue-4.14/video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch b/queue-4.14/video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch new file mode 100644 index 00000000000..50ccf6da526 --- /dev/null +++ b/queue-4.14/video-fbdev-sis-remove-unnecessary-parentheses-and-commented-code.patch @@ -0,0 +1,53 @@ +From 864eb1afc60cb43e7df879b97f8ca0d719bbb735 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 8 Oct 2018 12:57:36 +0200 +Subject: video: fbdev: sis: Remove unnecessary parentheses and commented code + +From: Nathan Chancellor + +commit 864eb1afc60cb43e7df879b97f8ca0d719bbb735 upstream. + +Clang warns when multiple pairs of parentheses are used for a single +conditional statement. + +drivers/video/fbdev/sis/init301.c:851:42: warning: equality comparison +with extraneous parentheses [-Wparentheses-equality] + } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || + ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ +drivers/video/fbdev/sis/init301.c:851:42: note: remove extraneous +parentheses around the comparison to silence this warning + } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || + ~ ^ ~ +drivers/video/fbdev/sis/init301.c:851:42: note: use '=' to turn this +equality comparison into an assignment + } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || + ^~ + = +1 warning generated. + +Remove the parentheses and while we're at it, clean up the commented +code, which has been here since the beginning of git history. + +Link: https://github.com/ClangBuiltLinux/linux/issues/118 +Signed-off-by: Nathan Chancellor +Cc: Thomas Winischhofer +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/fbdev/sis/init301.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/drivers/video/fbdev/sis/init301.c ++++ b/drivers/video/fbdev/sis/init301.c +@@ -522,9 +522,7 @@ SiS_PanelDelay(struct SiS_Private *SiS_P + SiS_DDC2Delay(SiS_Pr, 0x4000); + } + +- } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* || +- (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) || +- (SiS_Pr->SiS_CustomT == CUT_CLEVO1400) */ ) { /* 315 series, LVDS; Special */ ++ } else if (SiS_Pr->SiS_IF_DEF_LVDS == 1) { /* 315 series, LVDS; Special */ + + if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) { + PanelID = SiS_GetReg(SiS_Pr->SiS_P3d4,0x36); -- 2.47.3