* [PATCH 2/2] gianfar: Fix potential oops during OF address translation
@ 2010-04-23 17:12 Anton Vorontsov
2010-04-23 23:20 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Anton Vorontsov @ 2010-04-23 17:12 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Sandeep Gopalpet, linuxppc-dev
gianfar driver may pass NULL pointer to the of_translate_address(),
which may lead to a kernel oops. Fix this by using of_iomap(), which
is also much simpler and shorter.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
---
drivers/net/gianfar.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 080d1ce..df49af3 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -549,12 +549,8 @@ static int gfar_parse_group(struct device_node *np,
struct gfar_private *priv, const char *model)
{
u32 *queue_mask;
- u64 addr, size;
-
- addr = of_translate_address(np,
- of_get_address(np, 0, &size, NULL));
- priv->gfargrp[priv->num_grps].regs = ioremap(addr, size);
+ priv->gfargrp[priv->num_grps].regs = of_iomap(np, 0);
if (!priv->gfargrp[priv->num_grps].regs)
return -ENOMEM;
--
1.7.0.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] gianfar: Fix potential oops during OF address translation
2010-04-23 17:12 [PATCH 2/2] gianfar: Fix potential oops during OF address translation Anton Vorontsov
@ 2010-04-23 23:20 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-04-23 23:20 UTC (permalink / raw)
To: avorontsov; +Cc: netdev, Sandeep.Kumar, linuxppc-dev
From: Anton Vorontsov <avorontsov@mvista.com>
Date: Fri, 23 Apr 2010 21:12:44 +0400
> gianfar driver may pass NULL pointer to the of_translate_address(),
> which may lead to a kernel oops. Fix this by using of_iomap(), which
> is also much simpler and shorter.
>
> Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Also applied to net-2.6, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-23 23:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 17:12 [PATCH 2/2] gianfar: Fix potential oops during OF address translation Anton Vorontsov
2010-04-23 23:20 ` David Miller
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).