diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-03-11 22:30:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-11 22:30:47 -0700 |
| commit | 1d932c57e221f3d40a1b0468371132711177f6b3 (patch) | |
| tree | c9b00f69fdc7ac68601f8c657bdb74a820440aa8 /drivers | |
| parent | dbf205bb11e2135bfe07587c1188f90218d5e292 (diff) | |
| parent | 9ab453c8c302b5a95edee88dbcf06cf79b176037 (diff) | |
Merge "dsp: codecs: fix range check for audio buffer copying"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/qcom/qdsp6v2/audio_utils.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/misc/qcom/qdsp6v2/audio_utils.c b/drivers/misc/qcom/qdsp6v2/audio_utils.c index 15d82d126df7..af95daef6503 100644 --- a/drivers/misc/qcom/qdsp6v2/audio_utils.c +++ b/drivers/misc/qcom/qdsp6v2/audio_utils.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2016, 2019 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -879,8 +879,7 @@ 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; |