From: Luca Ceresoli <luca.ceresoli@bootlin.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Sowjanya Komatineni <skomatineni@nvidia.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
stable@vger.kernel.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
linux-media@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: media: tegra-video: fix device_node use after free
Date: Wed, 2 Nov 2022 10:35:56 +0100 [thread overview]
Message-ID: <20221102103556.4f556d6c@booty> (raw)
In-Reply-To: <Y1wMGpthKxr2egtY@kadam>
Hello Dan,
On Fri, 28 Oct 2022 20:06:34 +0300
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Fri, Oct 28, 2022 at 06:58:47PM +0200, Luca Ceresoli wrote:
> > Hello Dan,
> >
> > On Fri, 28 Oct 2022 15:34:39 +0300
> > Dan Carpenter <dan.carpenter@oracle.com> wrote:
> >
> > > On Fri, Oct 28, 2022 at 10:19:26AM +0200, luca.ceresoli@bootlin.com wrote:
> > > > From: Luca Ceresoli <luca.ceresoli@bootlin.com>
> > > >
> > > > At probe time this code path is followed:
> > > >
> > > > * tegra_csi_init
> > > > * tegra_csi_channels_alloc
> > > > * for_each_child_of_node(node, channel) -- iterates over channels
> > > > * automatically gets 'channel'
> > > > * tegra_csi_channel_alloc()
> > > > * saves into chan->of_node a pointer to the channel OF node
> > > > * automatically gets and puts 'channel'
> > > > * now the node saved in chan->of_node has refcount 0, can disappear
> > > > * tegra_csi_channels_init
> > > > * iterates over channels
> > > > * tegra_csi_channel_init -- uses chan->of_node
> > > >
> > > > After that, chan->of_node keeps storing the node until the device is
> > > > removed.
> > > >
> > > > of_node_get() the node and of_node_put() it during teardown to avoid any
> > > > risk.
> > > >
> > > > Fixes: 1ebaeb09830f ("media: tegra-video: Add support for external sensor capture")
> > > > Cc: stable@vger.kernel.org
> > > > Cc: Sowjanya Komatineni <skomatineni@nvidia.com>
> > > > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> > > > ---
> > > > drivers/staging/media/tegra-video/csi.c | 3 ++-
> > > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
> > > > index b26e44adb2be..1b05f620b476 100644
> > > > --- a/drivers/staging/media/tegra-video/csi.c
> > > > +++ b/drivers/staging/media/tegra-video/csi.c
> > > > @@ -433,7 +433,7 @@ static int tegra_csi_channel_alloc(struct tegra_csi *csi,
> > > > for (i = 0; i < chan->numgangports; i++)
> > > > chan->csi_port_nums[i] = port_num + i * CSI_PORTS_PER_BRICK;
> > > >
> > > > - chan->of_node = node;
> > > > + chan->of_node = of_node_get(node);
> > > > chan->numpads = num_pads;
> > > > if (num_pads & 0x2) {
> > > > chan->pads[0].flags = MEDIA_PAD_FL_SINK;
> > > > @@ -640,6 +640,7 @@ static void tegra_csi_channels_cleanup(struct tegra_csi *csi)
> > > > media_entity_cleanup(&subdev->entity);
> > > > }
> > > >
> > > > + of_node_put(chan->of_node);
> > > > list_del(&chan->list);
> > > > kfree(chan);
> > >
> > > Not related to your patch, but this kind of "one function cleans up
> > > everything" style is always buggy. For example, here it should be:
> > >
> > > - if (chan->mipi)
> > > + if (!IS_ERR_OR_NULL(chan->mipi))
> > > tegra_mipi_free(chan->mipi);
> >
> > I sort of agree the code could be clearer here, but looking at the code
> > in detail, this cannot happen. chan->mipi is set in one place only, and
> > if it is an error the whole probe fails. So it can be either NULL or a
> > valid pointer here.
>
> I assumed that tegra_csi_channels_cleanup() would clean up if
> tegra_csi_channel_alloc() fails. Otherwise then that's several
> different even worse bugs.
>
> HINT: Let's all hope my initial analysis was correct.
Indeed you have a point. Apologies for having replied in a hurry and for
the resulting noise.
I'm going to send a patch to fix the chan->mipi mess. However I think
the best way to do so would be a oneliner:
@@ -491,6 +491,7 @@ static int tegra_csi_channel_alloc(struct tegra_csi *csi,
chan->mipi = tegra_mipi_request(csi->dev, node);
if (IS_ERR(chan->mipi)) {
ret = PTR_ERR(chan->mipi);
+ chan->mipi = NULL;
dev_err(csi->dev, "failed to get mipi device: %d\n", ret);
}
This would be a correct implementation of the initial intent as it can
be inferred from the code, i.e. chan->mipi being either NULL or a valid
pointer. This makes sense as chan->mipi is assigned in a single place.
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
prev parent reply other threads:[~2022-11-02 9:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 8:19 [PATCH] staging: media: tegra-video: fix device_node use after free luca.ceresoli
2022-10-28 12:34 ` Dan Carpenter
2022-10-28 16:58 ` Luca Ceresoli
2022-10-28 17:06 ` Dan Carpenter
2022-11-02 9:35 ` Luca Ceresoli [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=20221102103556.4f556d6c@booty \
--to=luca.ceresoli@bootlin.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=skomatineni@nvidia.com \
--cc=stable@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
/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