[PATCH 10/13] staging: media: atomisp: one char read beyond end of string

[Greg Kroah-Hartman]

From: Dan Carpenter <dan.carpen...@oracle.com>

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 <dcb...@hotmail.com>
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 .../pci/atomisp2/css2400/hive_isp_css_include/string_support.h       | 5 ++---
 1 file 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;
-- 
2.13.0