From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jae Hyun Yoo Date: Mon, 28 Oct 2019 10:55:24 -0700 Subject: [PATCH v3] media: aspeed-video: Fix memory leaks in aspeed_video_probe In-Reply-To: <20191028171838.28533-1-navid.emamdoost@gmail.com> References: <20191028171838.28533-1-navid.emamdoost@gmail.com> Message-ID: <57550f1e-87b8-79c4-b1d6-7672b1ce11dc@linux.intel.com> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On 10/28/2019 10:18 AM, Navid Emamdoost wrote: > In the implementation of aspeed_video_probe() the allocated memory for > video should be released if either devm_ioremap_resource() > or aspeed_video_init() or aspeed_video_setup_video() fails. Replace > kzalloc() with devm_kzalloc to avoid explicit release for video. > > Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver") > Signed-off-by: Navid Emamdoost > --- > Changes in v3: > -- fix call to devm_kzalloc() Better keep all change history at here. > --- > drivers/media/platform/aspeed-video.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index eb12f3793062..70797b41447c 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -1646,7 +1646,8 @@ static int aspeed_video_probe(struct platform_device *pdev) > { > int rc; > struct resource *res; > - struct aspeed_video *video = kzalloc(sizeof(*video), GFP_KERNEL); > + struct aspeed_video *video = > + devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); For a case of assignment in definition section, let it go over the 80 chars. With this fixed: Reviewed-by: Jae Hyun Yoo > if (!video) > return -ENOMEM; >