From: Greg Kroah-Hartman Date: Sat, 2 May 2020 05:54:38 +0000 (+0200) Subject: drop of-unittest-kmemleak-on-changeset-destroy.patch from 4.14.y, 4.9.y and 4.4.y X-Git-Tag: v5.4.37~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19b05878d2f92d51c9729fc5f3b6311ff16e2f98;p=thirdparty%2Fkernel%2Fstable-queue.git drop of-unittest-kmemleak-on-changeset-destroy.patch from 4.14.y, 4.9.y and 4.4.y --- diff --git a/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch deleted file mode 100644 index c3070d537bb..00000000000 --- a/queue-4.14/of-unittest-kmemleak-on-changeset-destroy.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3cc24c9f756b3c6cf053671d0a108bc8736abe7e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Apr 2020 16:42:46 -0500 -Subject: of: unittest: kmemleak on changeset destroy - -From: Frank Rowand - -[ Upstream commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 ] - -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: Sasha Levin ---- - drivers/of/unittest.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c -index 55c98f119df22..e7e6dd07f2150 100644 ---- a/drivers/of/unittest.c -+++ b/drivers/of/unittest.c -@@ -605,6 +605,10 @@ static void __init of_unittest_changeset(void) - 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 - } - --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 61a3786f92d..4e4c6b236f8 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -106,7 +106,6 @@ arm64-delete-the-space-separator-in-__emit_inst.patch ext4-use-matching-invalidatepage-in-ext4_writepage.patch ext4-increase-wait-time-needed-before-reuse-of-delet.patch ext4-convert-bug_on-s-to-warn_on-s-in-mballoc.c.patch -of-unittest-kmemleak-on-changeset-destroy.patch hwmon-jc42-fix-name-to-have-no-illegal-characters.patch ext4-avoid-declaring-fs-inconsistent-due-to-invalid-file-handles.patch ext4-protect-journal-inode-s-blocks-using-block_validity.patch diff --git a/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch deleted file mode 100644 index 0a1a126ede9..00000000000 --- a/queue-4.4/of-unittest-kmemleak-on-changeset-destroy.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d414bb7c426244483d93a634ec27b8ea3174c065 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Apr 2020 16:42:46 -0500 -Subject: of: unittest: kmemleak on changeset destroy - -From: Frank Rowand - -[ Upstream commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 ] - -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: Sasha Levin ---- - drivers/of/unittest.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c -index 91e6891b777b6..109497dbfba08 100644 ---- a/drivers/of/unittest.c -+++ b/drivers/of/unittest.c -@@ -544,6 +544,10 @@ static void __init of_unittest_changeset(void) - mutex_unlock(&of_mutex); - - of_changeset_destroy(&chgset); -+ -+ of_node_put(n1); -+ of_node_put(n2); -+ of_node_put(n21); - #endif - } - --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index ba0be9dfc90..a68792e77a3 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -62,7 +62,6 @@ bpf-x86-fix-encoding-for-lower-8-bit-registers-in-bp.patch scsi-target-fix-pr-in-read-full-status-for-fc.patch xen-xenbus-ensure-xenbus_map_ring_valloc-returns-pro.patch ext4-convert-bug_on-s-to-warn_on-s-in-mballoc.c.patch -of-unittest-kmemleak-on-changeset-destroy.patch ext4-avoid-declaring-fs-inconsistent-due-to-invalid-file-handles.patch ext4-protect-journal-inode-s-blocks-using-block_validity.patch ext4-don-t-perform-block-validity-checks-on-the-journal-inode.patch diff --git a/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch b/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch deleted file mode 100644 index 4d200441430..00000000000 --- a/queue-4.9/of-unittest-kmemleak-on-changeset-destroy.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bb9849a504169887b187abd32663f707005f5675 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Apr 2020 16:42:46 -0500 -Subject: of: unittest: kmemleak on changeset destroy - -From: Frank Rowand - -[ Upstream commit b3fb36ed694b05738d45218ea72cf7feb10ce2b1 ] - -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: Sasha Levin ---- - drivers/of/unittest.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c -index aeb6d3009ae92..144d123f6ea4f 100644 ---- a/drivers/of/unittest.c -+++ b/drivers/of/unittest.c -@@ -539,6 +539,10 @@ static void __init of_unittest_changeset(void) - 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 - } - --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index c5d2719abb2..ca59622e6aa 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -70,7 +70,6 @@ objtool-fix-config_ubsan_trap-unreachable-warnings.patch objtool-support-clang-non-section-symbols-in-orc-dum.patch xen-xenbus-ensure-xenbus_map_ring_valloc-returns-pro.patch ext4-convert-bug_on-s-to-warn_on-s-in-mballoc.c.patch -of-unittest-kmemleak-on-changeset-destroy.patch hwmon-jc42-fix-name-to-have-no-illegal-characters.patch ext4-avoid-declaring-fs-inconsistent-due-to-invalid-file-handles.patch ext4-protect-journal-inode-s-blocks-using-block_validity.patch