tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3609fa95 9ace4753

+8 -8
+2
.mailmap
··· 705 705 Santosh Shilimkar <santosh.shilimkar@oracle.org> 706 706 Santosh Shilimkar <ssantosh@kernel.org> 707 707 Sarangdhar Joshi <spjoshi@codeaurora.org> 708 + Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org> 709 + Saravana Kannan <saravanak@kernel.org> <saravanak@google.com> 708 710 Sascha Hauer <s.hauer@pengutronix.de> 709 711 Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org> 710 712 Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
+3 -3
MAINTAINERS
··· 6532 6532 F: tools/testing/selftests/cpufreq/ 6533 6533 6534 6534 CPU FREQUENCY DRIVERS - VIRTUAL MACHINE CPUFREQ 6535 - M: Saravana Kannan <saravanak@google.com> 6535 + M: Saravana Kannan <saravanak@kernel.org> 6536 6536 L: linux-pm@vger.kernel.org 6537 6537 S: Maintained 6538 6538 F: drivers/cpufreq/virtual-cpufreq.c ··· 7170 7170 F: include/linux/devcoredump.h 7171 7171 7172 7172 DEVICE DEPENDENCY HELPER SCRIPT 7173 - M: Saravana Kannan <saravanak@google.com> 7173 + M: Saravana Kannan <saravanak@kernel.org> 7174 7174 L: linux-kernel@vger.kernel.org 7175 7175 S: Maintained 7176 7176 F: scripts/dev-needs.sh ··· 19547 19547 19548 19548 OPEN FIRMWARE AND FLATTENED DEVICE TREE 19549 19549 M: Rob Herring <robh@kernel.org> 19550 - M: Saravana Kannan <saravanak@google.com> 19550 + M: Saravana Kannan <saravanak@kernel.org> 19551 19551 L: devicetree@vger.kernel.org 19552 19552 S: Maintained 19553 19553 Q: http://patchwork.kernel.org/project/devicetree/list/
+3 -5
drivers/of/unittest.c
··· 1985 1985 */ 1986 1986 static int __init unittest_data_add(void) 1987 1987 { 1988 - void *unittest_data; 1989 1988 void *unittest_data_align; 1990 1989 struct device_node *unittest_data_node = NULL, *np; 1991 1990 /* ··· 2003 2004 } 2004 2005 2005 2006 /* creating copy */ 2006 - unittest_data = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL); 2007 + void *unittest_data __free(kfree) = kmalloc(size + FDT_ALIGN_SIZE, GFP_KERNEL); 2007 2008 if (!unittest_data) 2008 2009 return -ENOMEM; 2009 2010 ··· 2013 2014 ret = of_fdt_unflatten_tree(unittest_data_align, NULL, &unittest_data_node); 2014 2015 if (!ret) { 2015 2016 pr_warn("%s: unflatten testcases tree failed\n", __func__); 2016 - kfree(unittest_data); 2017 2017 return -ENODATA; 2018 2018 } 2019 2019 if (!unittest_data_node) { 2020 2020 pr_warn("%s: testcases tree is empty\n", __func__); 2021 - kfree(unittest_data); 2022 2021 return -ENODATA; 2023 2022 } 2024 2023 ··· 2035 2038 /* attach the sub-tree to live tree */ 2036 2039 if (!of_root) { 2037 2040 pr_warn("%s: no live tree to attach sub-tree\n", __func__); 2038 - kfree(unittest_data); 2039 2041 rc = -ENODEV; 2040 2042 goto unlock; 2041 2043 } ··· 2054 2058 2055 2059 EXPECT_END(KERN_INFO, 2056 2060 "Duplicate name in testcase-data, renamed to \"duplicate-name#1\""); 2061 + 2062 + retain_and_null_ptr(unittest_data); 2057 2063 2058 2064 unlock: 2059 2065 of_overlay_mutex_unlock();