Skip to contentSkip to conversation

sound fixes

GIT PULL Takashi Iwai 2 participants 4 messages Feb 12, 2010 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v2.6.33-rc8 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/hda

Hopefully this is the last pull request for 2.6.33...

Thanks!

Takashi

===

Jody Bruchon (1):
ALSA: hda-intel: Avoid divide by zero crash

---
 sound/pci/hda/hda_intel.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +6 -0
index b8faa6d..e767c3f 100644
@@ -1893,6 +1893,12 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
 	if (!bdl_pos_adj[chip->dev_index])
 		return 1; /* no delayed ack */
+	if (azx_dev->period_bytes == 0) {
+		printk(KERN_WARNING
+		       "hda-intel: Divide by zero was avoided "
+		       "in azx_dev->period_bytes.\n");
+		return 0;
+	}
 	if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
 		return 0; /* NG - it's below the period boundary */
 	return 1; /* OK, it's fine */
#1 lore raw
Quoted 3 lines · Takashi Iwai

Jody Bruchon (1):
ALSA: hda-intel: Avoid divide by zero crash

I pulled, but I really think it should look more like:

Quoted 10 lines
---
 sound/pci/hda/hda_intel.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +0 -0
index b8faa6d..e767c3f 100644

sound/pci/hda/hda_intel.c static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) · line 1901

Quoted 9 lines
sound/pci/hda/hda_intel.c +6 -0
@@ -1893,6 +1893,12 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
 	if (!bdl_pos_adj[chip->dev_index])
 		return 1; /* no delayed ack */
+	if (azx_dev->period_bytes == 0) {
+		printk(KERN_WARNING
+		       "hda-intel: Divide by zero was avoided "
+		       "in azx_dev->period_bytes.\n");
+		return 0;
+	}
	if (WARN_ONCE(!azx_dev->period_bytes, "hda-intel: zero azx_dev->period_bytes")
		return 0;

or something. It really doesn't want to warn multiple times, and by using a WARN_ONCE() it will also get picked up by kerneloops etc.

Or if that zero period_bytes is normal under certain circumstances, then there shouldn't be a printout at all.

Linus

#2 lore raw

At Fri, 12 Feb 2010 08:51:29 -0800 (PST),

Quoted 33 lines · Linus Torvalds
Quoted 3 lines · Takashi Iwai

Jody Bruchon (1):
ALSA: hda-intel: Avoid divide by zero crash

I pulled, but I really think it should look more like:

Quoted 10 lines
---
 sound/pci/hda/hda_intel.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
sound/pci/hda/hda_intel.c +0 -0
index b8faa6d..e767c3f 100644

sound/pci/hda/hda_intel.c static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) · line 1901

Quoted 9 lines
sound/pci/hda/hda_intel.c +6 -0
@@ -1893,6 +1893,12 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
 	if (!bdl_pos_adj[chip->dev_index])
 		return 1; /* no delayed ack */
+	if (azx_dev->period_bytes == 0) {
+		printk(KERN_WARNING
+		       "hda-intel: Divide by zero was avoided "
+		       "in azx_dev->period_bytes.\n");
+		return 0;
+	}
	if (WARN_ONCE(!azx_dev->period_bytes, "hda-intel: zero azx_dev->period_bytes")
		return 0;
Quoted 2 lines

or something. It really doesn't want to warn multiple times, and by using a WARN_ONCE() it will also get picked up by kerneloops etc.

Ah, right.

Quoted 2 lines

Or if that zero period_bytes is normal under certain circumstances, then there shouldn't be a printout at all.

This zero division shouldn't happen at all. I've never seen this, and this is the first report. I suspect it being some bogus IRQ, but the fix itself doesn't do wrong, so picked it up.

I'm going to fix to WARN_ONCE() quickly and send a pull request again.

Thanks!

Takashi

#3 lore raw

Linus,

please pull a sound fix for v2.6.33-rc8 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/hda

Thanks!

Takashi

===

Takashi Iwai (1):
ALSA: hda - use WARN_ON_ONCE() for zero-division detection

---
 sound/pci/hda/hda_intel.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
sound/pci/hda/hda_intel.c +3 -6
index e767c3f..3600e9c 100644
@@ -1893,12 +1893,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
 	if (!bdl_pos_adj[chip->dev_index])
 		return 1; /* no delayed ack */
-	if (azx_dev->period_bytes == 0) {
-		printk(KERN_WARNING
-		       "hda-intel: Divide by zero was avoided "
-		       "in azx_dev->period_bytes.\n");
-		return 0;
-	}
+	if (WARN_ONCE(!azx_dev->period_bytes,
+		      "hda-intel: zero azx_dev->period_bytes"))
+		return 0; /* this shouldn't happen! */
 	if (pos % azx_dev->period_bytes > azx_dev->period_bytes / 2)
 		return 0; /* NG - it's below the period boundary */
 	return 1; /* OK, it's fine */