Skip to contentSkip to conversation

powermac: Fix some 64b resource damage

PATCH In review Benjamin Herrenschmidt 2 participants 2 messages Jul 2, 2006

Subsystems (3)
Sound PowerPC Linux for power macintosh
lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 1/1 powermac: Fix some 64b resource damage

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 <[email protected]>

---
Linus, please apply asap since right now, PowerMac overflows kobject buffers on boot, pretty bad.

drivers/macintosh/macio_asic.c +2 -2
Index: linux-irq-work/drivers/macintosh/macio_asic.c
===================================================================
@@ -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
sound/ppc/pmac.c +1 -1
Index: linux-irq-work/sound/ppc/pmac.c
===================================================================
@@ -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);
#1 lore raw
Quoted 8 lines · Benjamin Herrenschmidt

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.

Quoted 4 lines
Signed-off-by Benjamin Herrenschmidt <[email protected]>

---
Linus, please apply asap since right now, PowerMac overflows kobject buffers on boot, pretty bad.

Acked by me, sorry about this.

greg k-h