Using strscpy was wrong because FORTIFY_SOURCE is passing the maximum possible size of the outermost object, but strscpy defines the count parameter as the exact buffer size, so this could copy past the end of the source. This would still be wrong with the planned usage of __builtin_object_size(p, 1) for intra-object overflow checks since it's the maximum possible size of the specified object with no guarantee of it being that large. Reuse of the fortified functions like this currently makes the runtime error reporting less precise but that can be improved later on. Noticed by Dave Jones and KASAN.
Unified · Split
| @@ -202,17 +202,6 @@ void __read_overflow2(void) __compiletime_error("detected read beyond size of ob · 201 unmodified lines | |||
| 202 | void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter"); | 202 | void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter"); |
| 203 | 203 | ||
| 204 | #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE) | 204 | #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE) |
| 205 | __FORTIFY_INLINE char *strcpy(char *p, const char *q) | ||
| 206 | { | ||
| 207 | size_t p_size = __builtin_object_size(p, 0); | ||
| 208 | size_t q_size = __builtin_object_size(q, 0); | ||
| 209 | if (p_size == (size_t)-1 && q_size == (size_t)-1) | ||
| 210 | return __builtin_strcpy(p, q); | ||
| 211 | if (strscpy(p, q, p_size < q_size ? p_size : q_size) < 0) | ||
| 212 | fortify_panic(__func__); | ||
| 213 | return p; | ||
| 214 | } | ||
| 215 | |||
| 216 | __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size) | 205 | __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size) |
| 217 | { | 206 | { |
| 218 | size_t p_size = __builtin_object_size(p, 0); | 207 | size_t p_size = __builtin_object_size(p, 0); |
| @@ -391,6 +380,18 @@ __FORTIFY_INLINE void *kmemdup(const void *p, size_t size, gfp_t gfp) · 172 unmodified lines | |||
| 391 | fortify_panic(__func__); | 380 | fortify_panic(__func__); |
| 392 | return __real_kmemdup(p, size, gfp); | 381 | return __real_kmemdup(p, size, gfp); |
| 393 | } | 382 | } |
| 383 | |||
| 384 | /* defined after fortified strlen and memcpy to reuse them */ | ||
| 385 | __FORTIFY_INLINE char *strcpy(char *p, const char *q) | ||
| 386 | { | ||
| 387 | size_t p_size = __builtin_object_size(p, 0); | ||
| 388 | size_t q_size = __builtin_object_size(q, 0); | ||
| 389 | if (p_size == (size_t)-1 && q_size == (size_t)-1) | ||
| 390 | return __builtin_strcpy(p, q); | ||
| 391 | memcpy(p, q, strlen(q) + 1); | ||
| 392 | return p; | ||
| 393 | } | ||
| 394 | |||
| 394 | #endif | 395 | #endif |
| 395 | 396 | ||
| 396 | #endif /* _LINUX_STRING_H_ */ | 397 | #endif /* _LINUX_STRING_H_ */ |