Skip to content

Commit

Permalink
[ALSA] pcm - Fix zero-division in 32bit compat layer
Browse files Browse the repository at this point in the history
PCM Midlevel
Fixed zero-division bug in PCM 32bit compat layer.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Aug 30, 2005
1 parent e0c93cf commit 7153a55
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/core/pcm_compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static int snd_pcm_ioctl_sw_params_compat(snd_pcm_substream_t *substream,
err = snd_pcm_sw_params(substream, &params);
if (err < 0)
return err;
if (put_user(boundary, &src->boundary))
if (boundary && put_user(boundary, &src->boundary))
return -EFAULT;
return err;
}
Expand Down Expand Up @@ -252,8 +252,11 @@ static int snd_pcm_ioctl_hw_params_compat(snd_pcm_substream_t *substream,
goto error;
}

if (! refine)
runtime->boundary = recalculate_boundary(runtime);
if (! refine) {
unsigned int new_boundary = recalculate_boundary(runtime);
if (new_boundary)
runtime->boundary = new_boundary;
}
error:
kfree(data);
return err;
Expand Down Expand Up @@ -408,6 +411,8 @@ static int snd_pcm_ioctl_sync_ptr_compat(snd_pcm_substream_t *substream,
status = runtime->status;
control = runtime->control;
boundary = recalculate_boundary(runtime);
if (! boundary)
boundary = 0x7fffffff;
snd_pcm_stream_lock_irq(substream);
/* FIXME: we should consider the boundary for the sync from app */
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
Expand Down

0 comments on commit 7153a55

Please sign in to comment.