lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 166/244] HSI: core: fix resource leaks in hsi_add_client_from_dt()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 5c08b0f75575648032f309a6f58294453423ed93 ]

    If some of the allocations fail between the dev_set_name() and the
    device_register() then the name will not be freed. Fix this by
    moving dev_set_name() directly in front of the call to device_register().

    Fixes: a2aa24734d9d ("HSI: Add common DT binding for HSI client devices")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hsi/hsi_core.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c
    index 47f0208aa7c3..a5f92e2889cb 100644
    --- a/drivers/hsi/hsi_core.c
    +++ b/drivers/hsi/hsi_core.c
    @@ -210,8 +210,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
    if (err)
    goto err;

    - dev_set_name(&cl->device, "%s", name);
    -
    err = hsi_of_property_parse_mode(client, "hsi-mode", &mode);
    if (err) {
    err = hsi_of_property_parse_mode(client, "hsi-rx-mode",
    @@ -293,6 +291,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
    cl->device.release = hsi_client_release;
    cl->device.of_node = client;

    + dev_set_name(&cl->device, "%s", name);
    if (device_register(&cl->device) < 0) {
    pr_err("hsi: failed to register client: %s\n", name);
    put_device(&cl->device);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 17:10    [W:6.580 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site