From 958ead636c14f10fce3954712f6e70d98db952b8 Mon Sep 17 00:00:00 2001 From: sin Date: Sat, 28 Feb 2015 16:48:58 +0000 Subject: Add readlink() and readlinkat() checks --- include/unistd.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/unistd.h b/include/unistd.h index 7a49da0..d019b51 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -95,6 +95,28 @@ __fortify_read(int fd, void *buf, size_t n) return read(fd, buf, n); } +static inline __attribute__ ((always_inline)) +ssize_t +__fortify_readlink(const char *path, char *buf, size_t n) +{ + size_t bos = __builtin_object_size(buf, 0); + + if (n > bos) + __builtin_trap(); + return readlink(path, buf, n); +} + +static inline __attribute__ ((always_inline)) +ssize_t +__fortify_readlinkat(int fd, const char *path, char *buf, size_t n) +{ + size_t bos = __builtin_object_size(buf, 0); + + if (n > bos) + __builtin_trap(); + return readlinkat(fd, path, buf, n); +} + static inline __attribute__ ((always_inline)) int __fortify_ttyname_r(int fd, char *name, size_t n) @@ -137,6 +159,10 @@ __fortify_write(int fd, const void *buf, size_t n) #define pread(fd, buf, n, offset) __fortify_pread(fd, buf, n, offset) #undef read #define read(fd, buf, n) __fortify_read(fd, buf, n) +#undef readlink +#define readlink(path, buf, n) __fortify_readlink(path, buf, n) +#undef readlinkat +#define readlinkat(fd, path, buf, n) __fortify_readlinkat(fd, path, buf, n) #undef ttyname_r #define ttyname_r(fd, name, n) __fortify_ttyname_r(fd, name, n) #undef write -- cgit v1.3