diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-28 14:57:31 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-28 14:57:31 +0800 |
| commit | 43c981bd2d8af8d91726be1fac389cdce47dce1e (patch) | |
| tree | 6e43e9f36b31fa7dfc1a73e1bb8145e15699383c /scripts | |
| parent | ecda003d45d780d790c7006b727ae56981a75013 (diff) | |
| parent | 07d9bf00133c330cd7c2bc9689f529c2bd0b64d0 (diff) | |
Merge branch 'v4.1/topic/KASAN' into linux-linaro-lsk-v4.1linux-linaro-lsk-v4.1-test
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dtc/libfdt/fdt_ro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c index 02b6d687537f..067c7acff61b 100644 --- a/scripts/dtc/libfdt/fdt_ro.c +++ b/scripts/dtc/libfdt/fdt_ro.c @@ -164,7 +164,7 @@ int fdt_path_offset(const void *fdt, const char *path) /* see if we have an alias */ if (*path != '/') { - const char *q = strchr(path, '/'); + const char *q = memchr(path, '/', end - p); if (!q) q = end; @@ -184,7 +184,7 @@ int fdt_path_offset(const void *fdt, const char *path) p++; if (! *p) return offset; - q = strchr(p, '/'); + q = memchr(p, '/', end - p); if (! q) q = end; |