mirror of git://anongit.mindrot.org/openssh.git
Return ERANGE from getcwd() if buffer size is 1.
If getcwd() is supplied a buffer size of exactly 1 and a path of "/", it could result in a nul byte being written out of array bounds. POSIX says it should return ERANGE if the path will not fit in the available buffer (with terminating nul). 1 byte cannot fit any possible path with its nul, so immediately return ERANGE in that case. OpenSSH never uses getcwd() with this buffer size, and all current (and even quite old) platforms that we are currently known to work on have a native getcwd() so this code is not used on those anyway. Reported by Qualys, ok djm@
This commit is contained in:
parent
36857fefd8
commit
527cb43fa1
|
@ -70,9 +70,12 @@ getcwd(char *pt, size_t size)
|
|||
*/
|
||||
if (pt) {
|
||||
ptsize = 0;
|
||||
if (!size) {
|
||||
if (size == 0) {
|
||||
errno = EINVAL;
|
||||
return (NULL);
|
||||
} else if (size == 1) {
|
||||
errno = ERANGE;
|
||||
return (NULL);
|
||||
}
|
||||
ept = pt + size;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue