From: Kangjie Lu <kjlu@umn.edu>
To: kjlu@umn.edu
Cc: pakki001@umn.edu, Jacob chen <jacob2.chen@rock-chips.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] media: rga: fix NULL pointer dereferences and a memory leak
Date: Tue, 12 Mar 2019 01:58:24 -0500 [thread overview]
Message-ID: <20190312065824.19646-1-kjlu@umn.edu> (raw)
In-Reply-To: <6fc9f670-a199-b83d-ff0a-d4cdb8cb80d1@arm.com>
In case __get_free_pages fails, the fix releases resources and
return -ENOMEM to avoid NULL pointer dereferences.
Also, the fix frees pages when video_register_device fails to
avoid a memory leak.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/media/platform/rockchip/rga/rga.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 5c653287185f..307b7ab0ab64 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -892,8 +892,17 @@ static int rga_probe(struct platform_device *pdev)
rga->src_mmu_pages =
(unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3);
+ if (!rga->src_mmu_pages) {
+ ret = -ENOMEM;
+ goto rel_vdev;
+ }
+
rga->dst_mmu_pages =
(unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3);
+ if (!rga->dst_mmu_pages) {
+ ret = -ENOMEM;
+ goto free_dst_pages;
+ }
def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;
def_frame.size = def_frame.stride * def_frame.height;
@@ -901,7 +910,7 @@ static int rga_probe(struct platform_device *pdev)
ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
if (ret) {
v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
- goto rel_vdev;
+ goto free_pages;
}
v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n",
@@ -909,6 +918,10 @@ static int rga_probe(struct platform_device *pdev)
return 0;
+free_pages:
+ free_pages((unsigned long)rga->src_mmu_pages, 3);
+free_dst_pages:
+ free_pages((unsigned long)rga->dst_mmu_pages, 3);
rel_vdev:
video_device_release(vfd);
unreg_video_dev:
--
2.17.1
next prev parent reply other threads:[~2019-03-12 6:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-09 6:35 [PATCH] media: rga: fix NULL pointer dereferences Kangjie Lu
2019-03-11 13:15 ` Steven Price
2019-03-12 6:58 ` Kangjie Lu [this message]
2019-03-13 13:35 ` [PATCH v2] media: rga: fix NULL pointer dereferences and a memory leak Steven Price
2019-03-14 5:03 ` [PATCH v3] media: rga: fix NULL pointer dereferences, use-after-free, " Kangjie Lu
2019-03-14 10:30 ` Steven Price
2019-03-28 14:47 ` Hans Verkuil
2019-03-28 15:00 ` Kangjie Lu
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=20190312065824.19646-1-kjlu@umn.edu \
--to=kjlu@umn.edu \
--cc=heiko@sntech.de \
--cc=jacob2.chen@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=pakki001@umn.edu \
/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
all inboxes | Powered by JetHome®