From: Rui Miguel Silva <rmfrfs@gmail.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Johan Hovold <johan@kernel.org>, Alex Elder <elder@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
greybus-dev@lists.linaro.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] staging: greybus: light: fix a couple double frees
Date: Thu, 29 Aug 2019 14:53:20 +0000 [thread overview]
Message-ID: <m35zmgvx9b.fsf@gmail.com> (raw)
In-Reply-To: <20190829122839.GA20116@mwanda>
Hi Dan,
On Thu 29 Aug 2019 at 13:28, Dan Carpenter wrote:
> The problem is in gb_lights_request_handler(). If we get a request to
> change the config then we release the light with gb_lights_light_release()
> and re-allocated it. However, if the allocation fails part way through
> then we call gb_lights_light_release() again. This can lead to a couple
> different double frees where we haven't cleared out the original values:
>
> gb_lights_light_v4l2_unregister(light);
> ...
> kfree(light->channels);
> kfree(light->name);
>
> I also made a small change to how we set "light->channels_count = 0;".
> The original code handled this part fine and did not cause a use after
> free but it was sort of complicated to read.
>
> Fixes: 2870b52bae4c ("greybus: lights: add lights implementation")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
Thanks so much for this, I was looking for some time at this and
was half way to a much less elegant fix then yours.
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Cheers,
Rui
> ---
> drivers/staging/greybus/light.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
> index 010ae1e9c7fb..40680eaf3974 100644
> --- a/drivers/staging/greybus/light.c
> +++ b/drivers/staging/greybus/light.c
> @@ -1098,21 +1098,21 @@ static void gb_lights_channel_release(struct gb_channel *channel)
> static void gb_lights_light_release(struct gb_light *light)
> {
> int i;
> - int count;
>
> light->ready = false;
>
> - count = light->channels_count;
> -
> if (light->has_flash)
> gb_lights_light_v4l2_unregister(light);
> + light->has_flash = false;
>
> - for (i = 0; i < count; i++) {
> + for (i = 0; i < light->channels_count; i++)
> gb_lights_channel_release(&light->channels[i]);
> - light->channels_count--;
> - }
> + light->channels_count = 0;
> +
> kfree(light->channels);
> + light->channels = NULL;
> kfree(light->name);
> + light->name = NULL;
> }
>
> static void gb_lights_release(struct gb_lights *glights)
prev parent reply other threads:[~2019-08-29 14:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 12:28 [PATCH] staging: greybus: light: fix a couple double frees Dan Carpenter
2019-08-29 14:53 ` Rui Miguel Silva [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m35zmgvx9b.fsf@gmail.com \
--to=rmfrfs@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=elder@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=greybus-dev@lists.linaro.org \
--cc=johan@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).