lkml.org 
[lkml]   [2022]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 085/105] soc: fsl: guts: Add a missing memory allocation failure check
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit b9abe942cda43a1d46a0fd96efb54f1aa909f757 ]

    If 'devm_kstrdup()' fails, we should return -ENOMEM.

    While at it, move the 'of_node_put()' call in the error handling path and
    after the 'machine' has been copied.
    Better safe than sorry.

    Fixes: a6fc3b698130 ("soc: fsl: add GUTS driver for QorIQ platforms")
    Depends-on: fddacc7ff4dd ("soc: fsl: guts: Revert commit 3c0d64e867ed")
    Suggested-by: Tyrel Datwyler <tyreld@linux.ibm.com>
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Li Yang <leoyang.li@nxp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/fsl/guts.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
    index 6d7465afd6fd..091e94c04f30 100644
    --- a/drivers/soc/fsl/guts.c
    +++ b/drivers/soc/fsl/guts.c
    @@ -160,9 +160,14 @@ static int fsl_guts_probe(struct platform_device *pdev)
    root = of_find_node_by_path("/");
    if (of_property_read_string(root, "model", &machine))
    of_property_read_string_index(root, "compatible", 0, &machine);
    - of_node_put(root);
    - if (machine)
    + if (machine) {
    soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL);
    + if (!soc_dev_attr.machine) {
    + of_node_put(root);
    + return -ENOMEM;
    + }
    + }
    + of_node_put(root);

    svr = fsl_guts_get_svr();
    soc_die = fsl_soc_die_match(svr, fsl_soc_die);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-03-07 10:51    [W:6.054 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site