lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 094/215] soundwire: intel: fix memory leak with devm_kasprintf
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 ]

    The dais are allocated with devm_kcalloc() but their name isn't
    resourced managed and never freed. Fix by also using devm_ for the dai
    names as well.

    Fixes: c46302ec554c5 ('soundwire: intel: Add audio DAI ops')
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
    Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
    Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
    Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
    Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Link: https://lore.kernel.org/r/20200617163536.17401-1-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soundwire/intel.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
    index d1839707128a8..243af8198d1c6 100644
    --- a/drivers/soundwire/intel.c
    +++ b/drivers/soundwire/intel.c
    @@ -842,8 +842,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,

    /* TODO: Read supported rates/formats from hardware */
    for (i = off; i < (off + num); i++) {
    - dais[i].name = kasprintf(GFP_KERNEL, "SDW%d Pin%d",
    - cdns->instance, i);
    + dais[i].name = devm_kasprintf(cdns->dev, GFP_KERNEL,
    + "SDW%d Pin%d",
    + cdns->instance, i);
    if (!dais[i].name)
    return -ENOMEM;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-20 18:40    [W:6.266 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site