[ALSA] pcm - Fix zero-division in 32bit compat layer
PCM Midlevel Fixed zero-division bug in PCM 32bit compat layer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
e0c93cf311
commit
7153a558ad
@ -144,7 +144,7 @@ static int snd_pcm_ioctl_sw_params_compat(snd_pcm_substream_t *substream,
|
|||||||
err = snd_pcm_sw_params(substream, ¶ms);
|
err = snd_pcm_sw_params(substream, ¶ms);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
if (put_user(boundary, &src->boundary))
|
if (boundary && put_user(boundary, &src->boundary))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@ -252,8 +252,11 @@ static int snd_pcm_ioctl_hw_params_compat(snd_pcm_substream_t *substream,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! refine)
|
if (! refine) {
|
||||||
runtime->boundary = recalculate_boundary(runtime);
|
unsigned int new_boundary = recalculate_boundary(runtime);
|
||||||
|
if (new_boundary)
|
||||||
|
runtime->boundary = new_boundary;
|
||||||
|
}
|
||||||
error:
|
error:
|
||||||
kfree(data);
|
kfree(data);
|
||||||
return err;
|
return err;
|
||||||
@ -408,6 +411,8 @@ static int snd_pcm_ioctl_sync_ptr_compat(snd_pcm_substream_t *substream,
|
|||||||
status = runtime->status;
|
status = runtime->status;
|
||||||
control = runtime->control;
|
control = runtime->control;
|
||||||
boundary = recalculate_boundary(runtime);
|
boundary = recalculate_boundary(runtime);
|
||||||
|
if (! boundary)
|
||||||
|
boundary = 0x7fffffff;
|
||||||
snd_pcm_stream_lock_irq(substream);
|
snd_pcm_stream_lock_irq(substream);
|
||||||
/* FIXME: we should consider the boundary for the sync from app */
|
/* FIXME: we should consider the boundary for the sync from app */
|
||||||
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
|
||||||
|
Loading…
Reference in New Issue
Block a user