From: Mikel Rychliski <mikel@mikelr.com>
To: amd-gfx@lists.freedesktop.org, linux-pci@vger.kernel.org,
nouveau@lists.freedesktop.org
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Matthew Garrett" <matthewgarrett@google.com>,
"Ben Skeggs" <bskeggs@redhat.com>,
"Mikel Rychliski" <mikel@mikelr.com>
Subject: [PATCH RESEND v2 1/2] drm/radeon: Stop directly referencing iomem
Date: Fri, 13 Mar 2020 18:22:57 -0400 [thread overview]
Message-ID: <20200313222258.15659-2-mikel@mikelr.com> (raw)
In-Reply-To: <20200313222258.15659-1-mikel@mikelr.com>
pci_platform_rom() returns an __iomem pointer which should not be
accessed directly. Change radeon_read_platform_bios() to use
memcpy_fromio() instead of calling kmemdup() on the __iomem pointer.
Signed-off-by: Mikel Rychliski <mikel@mikelr.com>
---
drivers/gpu/drm/radeon/radeon_bios.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index c42f73fad3e3..c3ae4c92a115 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -118,11 +118,14 @@ static bool radeon_read_platform_bios(struct radeon_device *rdev)
return false;
}
- if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) {
+ rdev->bios = kzalloc(size, GFP_KERNEL);
+ if (!rdev->bios)
return false;
- }
- rdev->bios = kmemdup(bios, size, GFP_KERNEL);
- if (rdev->bios == NULL) {
+
+ memcpy_fromio(rdev->bios, bios, size);
+
+ if (size == 0 || rdev->bios[0] != 0x55 || rdev->bios[1] != 0xaa) {
+ kfree(rdev->bios);
return false;
}
--
2.13.7
next prev parent reply other threads:[~2020-03-13 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 22:22 [PATCH RESEND v2 0/2] Fix loading of platform ROM from 32-bit EFI Mikel Rychliski
2020-03-13 22:22 ` Mikel Rychliski [this message]
2020-03-13 22:22 ` [PATCH RESEND v2 2/2] PCI: Use ioremap(), not phys_to_virt() for platform ROM Mikel Rychliski
2020-03-17 14:47 ` Christoph Hellwig
2020-03-18 1:34 ` Mikel Rychliski
2020-03-18 6:51 ` Christoph Hellwig
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=20200313222258.15659-2-mikel@mikelr.com \
--to=mikel@mikelr.com \
--cc=David1.Zhou@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bhelgaas@google.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=linux-pci@vger.kernel.org \
--cc=matthewgarrett@google.com \
--cc=nouveau@lists.freedesktop.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).