tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 4140d90c: am 3acc908c: Merge "FORTIFY_SOURCE: fortify strchr"

Browse source 
* commit '4140d90c60e0a9b5b2f1b8ad3d17e169f7288ae9':
  FORTIFY_SOURCE: fortify strchr
This commit is contained in:
Nick Kralevich 2012-11-30 18:47:06 -08:00 committed by Android Git Automerger
commit 59b8677562
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libc/include/string.h
View file

@ -224,6 +224,23 @@ size_t strlen(const char *s) {
return __strlen_chk(s, bos); return __strlen_chk(s, bos);
} }
__purefunc extern char* __strchr_real(const char *, int)
__asm__(__USER_LABEL_PREFIX__ "strchr");
extern char* __strchr_chk(const char *, int, size_t);
__BIONIC_FORTIFY_INLINE
char* strchr(const char *s, int c) {
size_t bos = __builtin_object_size(s, 0);
// Compiler doesn't know destination size. Don't call __strchr_chk
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __strchr_real(s, c);
}
return __strchr_chk(s, c, bos);
}
#endif /* defined(__BIONIC_FORTIFY_INLINE) */ #endif /* defined(__BIONIC_FORTIFY_INLINE) */
__END_DECLS __END_DECLS

1
libc/private/logd.h
View file

@ -29,6 +29,7 @@
#define _ANDROID_BIONIC_LOGD_H #define _ANDROID_BIONIC_LOGD_H
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#define BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW 80100 #define BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW 80100
#define BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW 80105 #define BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW 80105

15
libc/string/strchr.c
View file

@ -29,11 +29,17 @@
*/ */
#include <string.h> #include <string.h>
#include <private/logd.h>
char * char *
strchr(const char *p, int ch) __strchr_chk(const char *p, int ch, size_t s_len)
{ {
for (;; ++p) { for (;; ++p, s_len--) {
if (s_len == 0) {
__libc_android_log_print(ANDROID_LOG_FATAL, "libc",
"*** FORTIFY_SOURCE strchr read beyond buffer ***\n");
abort();
}
if (*p == (char) ch) if (*p == (char) ch)
return((char *)p); return((char *)p);
if (!*p) if (!*p)
@ -41,3 +47,8 @@ strchr(const char *p, int ch)
} }
/* NOTREACHED */ /* NOTREACHED */
} }
char *
strchr(const char *p, int ch) {
return __strchr_chk(p, ch, (size_t) -1);
}