* [PATCH] powermac: Fix some 64b resource damage
@ 2006-07-02 1:55 Benjamin Herrenschmidt
2006-07-02 4:05 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2006-07-02 1:55 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds
Cc: linuxppc-dev list, Greg Kroah-Hartman, Paul Mackerras
The 64 bits resource patches did a bit of damage on PowerMac causing a
buffer overflow in macio_asic and a warning in a sound driver. The
former is fixed by reverting the sprintf of the bus_id to %08x as it was
before. The bus_id used for macio devices is always a 32 bits value
(macio always sits in 32 bits space) and since it's exposed to userland,
the format of the string shouldn't be changed like that anyway. The
second by using the proper type for printk.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
Linus, please apply asap since right now, PowerMac overflows kobject
buffers on boot, pretty bad.
Index: linux-irq-work/drivers/macintosh/macio_asic.c
===================================================================
--- linux-irq-work.orig/drivers/macintosh/macio_asic.c 2006-07-02 11:46:53.000000000 +1000
+++ linux-irq-work/drivers/macintosh/macio_asic.c 2006-07-02 11:47:37.000000000 +1000
@@ -427,10 +427,10 @@
/* MacIO itself has a different reg, we use it's PCI base */
if (np == chip->of_node) {
- sprintf(dev->ofdev.dev.bus_id, "%1d.%016llx:%.*s",
+ sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
chip->lbus.index,
#ifdef CONFIG_PCI
- (unsigned long long)pci_resource_start(chip->lbus.pdev, 0),
+ (unsigned int)pci_resource_start(chip->lbus.pdev, 0),
#else
0, /* NuBus may want to do something better here */
#endif
Index: linux-irq-work/sound/ppc/pmac.c
===================================================================
--- linux-irq-work.orig/sound/ppc/pmac.c 2006-07-02 11:46:53.000000000 +1000
+++ linux-irq-work/sound/ppc/pmac.c 2006-07-02 11:48:40.000000000 +1000
@@ -1170,7 +1170,7 @@
chip->rsrc[i].start + 1,
rnames[i]) == NULL) {
printk(KERN_ERR "snd: can't request rsrc "
- " %d (%s: 0x%016lx:%016lx)\n",
+ " %d (%s: 0x%016llx:%016llx)\n",
i, rnames[i],
(unsigned long long)chip->rsrc[i].start,
(unsigned long long)chip->rsrc[i].end);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] powermac: Fix some 64b resource damage
2006-07-02 1:55 [PATCH] powermac: Fix some 64b resource damage Benjamin Herrenschmidt
@ 2006-07-02 4:05 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2006-07-02 4:05 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Andrew Morton, linuxppc-dev list, Linus Torvalds, Paul Mackerras
On Sun, Jul 02, 2006 at 11:55:03AM +1000, Benjamin Herrenschmidt wrote:
> The 64 bits resource patches did a bit of damage on PowerMac causing a
> buffer overflow in macio_asic and a warning in a sound driver. The
> former is fixed by reverting the sprintf of the bus_id to %08x as it was
> before. The bus_id used for macio devices is always a 32 bits value
> (macio always sits in 32 bits space) and since it's exposed to userland,
> the format of the string shouldn't be changed like that anyway. The
> second by using the proper type for printk.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> Linus, please apply asap since right now, PowerMac overflows kobject
> buffers on boot, pretty bad.
Acked by me, sorry about this.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-07-02 4:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-02 1:55 [PATCH] powermac: Fix some 64b resource damage Benjamin Herrenschmidt
2006-07-02 4:05 ` Greg KH
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).