From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3C38C4167B for ; Sun, 10 Dec 2023 13:32:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbjLJNca (ORCPT ); Sun, 10 Dec 2023 08:32:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbjLJNc2 (ORCPT ); Sun, 10 Dec 2023 08:32:28 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D64CDF for ; Sun, 10 Dec 2023 05:32:35 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47975C433C8; Sun, 10 Dec 2023 13:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702215154; bh=648SWHIYNJDT/+aiucrXnkcL7Mil/8x5gJTHL49sKWY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=pMDWKvtF+c+gtQLFvWS7ZcoEriiLmbqJDSvCnPeAuqmNmIs6jVsQrCrFItuDo+o0u XKsWQeK2qjQInSI+oT9SGX2cLtX8onqoETF2EldZuU1uWUOgjP3UF3Uvb2ztp0VXvr qlVlrvRGYbtkzSR6q5N+s/0710ZAiGWs1KywxDmJK9XnWlFkMaPh4T1hI8uGj2OIWO DrQmxNzCxuAtMjk9z4H/nertu0v9pHWH952DH3W3rkkUoKWVeI6yFK/Fcq08gbQUrk puPyFEDILYjoqEHwz0Gdw8CFwo11Act6UIVgJ/1GMEW4f3jl7mBhqPF+VnE3Q6Fnsc jodWG3KoIWGxg== Date: Sun, 10 Dec 2023 13:32:28 +0000 From: Jonathan Cameron To: Dinghao Liu Cc: Lars-Peter Clausen , Alexandru Ardelean , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iio: core: fix memleak in iio_device_register_sysfs Message-ID: <20231210133228.5fd425ea@jic23-huawei> In-Reply-To: <20231208073119.29283-1-dinghao.liu@zju.edu.cn> References: <20231208073119.29283-1-dinghao.liu@zju.edu.cn> X-Mailer: Claws Mail 4.2.0 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 8 Dec 2023 15:31:19 +0800 Dinghao Liu wrote: > When iio_device_register_sysfs_group() fails, we should > free iio_dev_opaque->chan_attr_group.attrs to prevent > potential memleak. > > Fixes: 32f171724e5c ("iio: core: rework iio device group creation") > Signed-off-by: Dinghao Liu Hi. Looks good to me, but I'd like to leave this one on the list a little longer to see if anyone else has comments. Jonathan > --- > drivers/iio/industrialio-core.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index c77745b594bd..e6d3d07a4c83 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -1581,10 +1581,13 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev) > ret = iio_device_register_sysfs_group(indio_dev, > &iio_dev_opaque->chan_attr_group); > if (ret) > - goto error_clear_attrs; > + goto error_free_chan_attrs; > > return 0; > > +error_free_chan_attrs: > + kfree(iio_dev_opaque->chan_attr_group.attrs); > + iio_dev_opaque->chan_attr_group.attrs = NULL; > error_clear_attrs: > iio_free_chan_devattr_list(&iio_dev_opaque->channel_attr_list); >