Merge "dsp: codecs: fix range check for audio buffer copying"

This commit is contained in:
Linux Build Service Account 2019-03-06 02:55:37 -08:00 • committed by Gerrit - the friendly Code Review server
commit c38af66a58

View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2010-2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@ -900,9 +900,8 @@ ssize_t audio_in_write(struct file *file,
__func__, audio->ac->session);
}
}
xfer = (count > (audio->pcm_cfg.buffer_size)) ?
(audio->pcm_cfg.buffer_size) : count;
xfer = (count > size) ? size : count;
if (copy_from_user(cpy_ptr, buf, xfer)) {
rc = -EFAULT;
break;