diff options
| author | Dan Carpenter | 2017-05-18 15:50:19 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-05-19 11:57:29 +0200 |
| commit | d1fec5bdeb18ff98fbe317a9454bcd1fe8da1bee (patch) | |
| tree | d8628712aa094310412b81bf6ed5f17d5a87c35e /drivers/staging/media/atomisp/pci/atomisp2/css2400 | |
| parent | [media] atomisp: Fix -Werror=int-in-bool-context compile errors (diff) | |
| download | kernel-qcow2-linux-d1fec5bdeb18ff98fbe317a9454bcd1fe8da1bee.tar.gz kernel-qcow2-linux-d1fec5bdeb18ff98fbe317a9454bcd1fe8da1bee.tar.xz kernel-qcow2-linux-d1fec5bdeb18ff98fbe317a9454bcd1fe8da1bee.zip | |
[media] atomisp: one char read beyond end of string
We should verify that "ix < max_len" before we test whether we have
reached the NUL terminator.
Fixes: a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h index 568631698a3d..74b5a1c7ac9a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h @@ -72,9 +72,8 @@ static size_t strnlen_s( return 0; } - for (ix=0; - ((src_str[ix] != '\0') && (ix< max_len)); - ++ix) /*Nothing else to do*/; + for (ix = 0; ix < max_len && src_str[ix] != '\0'; ix++) + ; /* On Error, it will return src_size == max_len*/ return ix; |