Message ID | 20221028081926.2320663-1-luca.ceresoli@bootlin.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp700709wru; Fri, 28 Oct 2022 01:37:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+ZT1/7m08xPzFeeiXrJzC+Sv5onDSQPwuhD1YnuBYAmPReo48O9J8cT5ZE/ZodrHo2H5Q X-Received: by 2002:a05:6a00:22cc:b0:56b:f793:5ab2 with SMTP id f12-20020a056a0022cc00b0056bf7935ab2mr22012453pfj.3.1666946249405; Fri, 28 Oct 2022 01:37:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666946249; cv=none; d=google.com; s=arc-20160816; b=Qad27NZZ1v1y2hMllBE/Sox0Fna4aEPCvpqsebsqjL/fyKh8qMT9oyjbXMTxnGCfWC AEKPvXBaRHbKdzgxWrLUlo+KwO9Ye6ISQ4mKo5N/eJW4q9ix4yM98Lrx5lsQEgFyDgST 3TexEGGfWJYc7B7/SRfBcXwsXAyGA0tv2kylCbaAXeYH4mzCrMy1vzT7xPvb3X4bEeSc Yqhc57ILoJleBkxvYLyjJuhvU5GNWoVHe0jV8EUzQnYNpjCt8EHdesADajzvddDVPikG FVvnzyt0GQNcKlfzZFeEltEaD1+R2taZ0NZ6vuUPZ5bDOLD3QYiqD7YqMkp+1AQ2rhQc Giuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vqicJIpaIUCqnWaaaf6uDqbeDvMy142ZJ+vF7cMzObg=; b=VgRfcFgS0uToDnTGz/UABXntfpP9pTeqhbAkYnPVMChk9nCpersi4fg7xgaVjODdXx QoSapB3a4BWR8F1QzTxYjFvhxeu79XC1jJc6xH6UBebguIcFOGbaoRXxCWrkFtNIoAnb 9e6Va0DRXyctMAeYQMDWN8KzU+kPeNQnUwOWvd2bdXr8TZPLhh2irv3Q12a9f7pG2yVb LKnp2yDEPpTj5bcUZpctMXQFoq+/p/rCjW5EEYKZ+EzrgmRhej8/Js/F0Xh8BUy3h+4Q xnNWWgfe51zOtcVCUHYPiywYtb3bYXs2aQz3CfPPtQjDoKbA2wDGGPKt9mQMdCWuQvKP ckfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=bkKIitou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ls10-20020a17090b350a00b0021336b17122si5576573pjb.5.2022.10.28.01.37.15; Fri, 28 Oct 2022 01:37:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=bkKIitou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230003AbiJ1ITu (ORCPT <rfc822;chrisfriedt@gmail.com> + 99 others); Fri, 28 Oct 2022 04:19:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbiJ1ITs (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 28 Oct 2022 04:19:48 -0400 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::228]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF92E101EA; Fri, 28 Oct 2022 01:19:45 -0700 (PDT) Received: from booty.fritz.box (unknown [77.244.183.192]) (Authenticated sender: luca.ceresoli@bootlin.com) by mail.gandi.net (Postfix) with ESMTPA id 150001BF205; Fri, 28 Oct 2022 08:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1666945183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vqicJIpaIUCqnWaaaf6uDqbeDvMy142ZJ+vF7cMzObg=; b=bkKIitouTwGX+kxNBk+gZ1C/8NirLVohgyvNA9v481ufDHZiyykNv8jQ58K6hcQ51bJvbY 3OHdlEBwpIcPRdjrBnyMJMUrQjx5M40EJ9MYv+pV0cnBQKEAOrsK64BDE+428sxZpcUIYQ JPt2PgbhHuZSuCnbBtHSDotME8E0JtTBMWXCggE3M1kS4AL6cpMKmccV+F4hBRiHcFNhfC /J89pj8ugT6GSoSmnRrA9QGyYcM76IbCMaMqngzExsY1UX4i0q0E0cgvQM+NYyQ2ssOxWR FI3nHWQUgHDxi8bzHsvF834UmiDzMf5tZzlCDb0WXFmVqMw5mcHc1WQiTe6nJA== From: luca.ceresoli@bootlin.com To: 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> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Luca Ceresoli <luca.ceresoli@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: [PATCH] staging: media: tegra-video: fix device_node use after free Date: Fri, 28 Oct 2022 10:19:26 +0200 Message-Id: <20221028081926.2320663-1-luca.ceresoli@bootlin.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747919830421083652?= X-GMAIL-MSGID: =?utf-8?q?1747919830421083652?= |
Series |
staging: media: tegra-video: fix device_node use after free
|
|
Commit Message
Luca Ceresoli
Oct. 28, 2022, 8:19 a.m. UTC
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(-)
Comments
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); regards, dan carpenter
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. Regarding my patch, do you think it is valid? Best regards.
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. > > Regarding my patch, do you think it is valid? It sort of depends on if the "chan->mipi" dereference can crash like I explained above. If there is no ->mipi crash then the error handling needs to be fixed. regards, dan carpenter
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.
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); }