__readlink_chk, __readlinkat_chk: properly pass buffer length #115
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 tasks
josch
reviewed
Nov 27, 2023
| if ((linksize = nextcall(__readlink_chk)(path, tmp, FAKECHROOT_PATH_MAX-1, buflen)) == -1) { | ||
| if (__builtin_expect(!!(bufsiz > buflen), 0)) { | ||
| printf("readlink: prevented write past end of buffer\n"); | ||
| exit(-1); |
There was a problem hiding this comment.
why the exit? why not just return failure?
There was a problem hiding this comment.
Because _chk functions should exit on overflow. Actually __chk_fail should be called (similar to __realpath_chk).
https://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libc---readlink-chk-1.html
| @@ -41,7 +42,12 @@ wrapper(__readlink_chk, ssize_t, (const char * path, char * buf, size_t bufsiz, | |||
| debug("__readlink_chk(\"%s\", &buf, %zd, %zd)", path, bufsiz, buflen); | |||
| expand_chroot_path(path); | |||
|
|
|||
| if ((linksize = nextcall(__readlink_chk)(path, tmp, FAKECHROOT_PATH_MAX-1, buflen)) == -1) { | |||
| if (__builtin_expect(!!(bufsiz > buflen), 0)) { | |||
| printf("readlink: prevented write past end of buffer\n"); | |||
There was a problem hiding this comment.
why the printf to stdout? at most there is a print to stderr done in the rest of the codebase
| @@ -41,7 +42,12 @@ wrapper(__readlink_chk, ssize_t, (const char * path, char * buf, size_t bufsiz, | |||
| debug("__readlink_chk(\"%s\", &buf, %zd, %zd)", path, bufsiz, buflen); | |||
| expand_chroot_path(path); | |||
|
|
|||
| if ((linksize = nextcall(__readlink_chk)(path, tmp, FAKECHROOT_PATH_MAX-1, buflen)) == -1) { | |||
| if (__builtin_expect(!!(bufsiz > buflen), 0)) { | |||
There was a problem hiding this comment.
why the double exclamation mark? bufsiz > buflen is already a boolean
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #114