Commit 3609fa95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree fixes from Rob Herring:

 - Fix an error path memory leak in DT unittest

 - Update Saravana's bouncing email

* tag 'devicetree-fixes-for-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: unittest: Fix memory leak in unittest_data_add()
  MAINTAINERS: Update Saravana Kannan's email address
parents 9ace4753 235a1eb8

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>

Sascha Hauer <s.hauer@pengutronix.de>

Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>

Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6532,7 +6532,7 @@ F: rust/kernel/cpufreq.rs 
F:	tools/testing/selftests/cpufreq/









CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	drivers/cpufreq/virtual-cpufreq.c








@@ -7170,7 +7170,7 @@ F:	drivers/base/devcoredump.c







F:	include/linux/devcoredump.h

















DEVICE DEPENDENCY HELPER SCRIPT









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	scripts/dev-needs.sh








@@ -19547,7 +19547,7 @@ F:	include/linux/oa_tc6.h















OPEN FIRMWARE AND FLATTENED DEVICE TREE









M:	Rob Herring <robh@kernel.org>









M:	Saravana Kannan <saravanak@google.com>









M:	Saravana Kannan <saravanak@kernel.org>









L:	devicetree@vger.kernel.org









S:	Maintained









Q:	http://patchwork.kernel.org/project/devicetree/list/

























drivers/of/unittest.c



+3
−5






























Original line number
Diff line number
Diff line







@@ -1985,7 +1985,6 @@ static void attach_node_and_children(struct device_node *np)







 */









static int __init unittest_data_add(void)









{









	void *unittest_data;









	void *unittest_data_align;









	struct device_node *unittest_data_node = NULL, *np;









	/*








@@ -2004,7 +2003,7 @@ static int __init unittest_data_add(void)







	}



















	/* creating copy */









	unittest_data = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL);









	void *unittest_data __free(kfree) = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL);









	if (!unittest_data)









		return -ENOMEM;


















@@ -2014,12 +2013,10 @@ static int __init unittest_data_add(void)







	ret = of_fdt_unflatten_tree(unittest_data_align, NULL, &unittest_data_node);









	if (!ret) {









		pr_warn("%s: unflatten testcases tree failed\n", __func__);









		kfree(unittest_data);









		return -ENODATA;









	}









	if (!unittest_data_node) {









		pr_warn("%s: testcases tree is empty\n", __func__);









		kfree(unittest_data);









		return -ENODATA;









	}


















@@ -2038,7 +2035,6 @@ static int __init unittest_data_add(void)







	/* attach the sub-tree to live tree */









	if (!of_root) {









		pr_warn("%s: no live tree to attach sub-tree\n", __func__);









		kfree(unittest_data);









		rc = -ENODEV;









		goto unlock;









	}








@@ -2059,6 +2055,8 @@ static int __init unittest_data_add(void)







	EXPECT_END(KERN_INFO,









		   "Duplicate name in testcase-data, renamed to \"duplicate-name#1\"");



















	retain_and_null_ptr(unittest_data);



















unlock:









	of_overlay_mutex_unlock();