picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1768 from vcaputo/sd-daemon-listen-fds-overflow-bis

Browse source 
sd-daemon: fix potential LISTEN_FDS overflow in sd_listen_fds()
This commit is contained in:
Lennart Poettering 2015-11-04 11:55:40 +01:00
parent 5604b971cf 046c93f8db
commit b3d2548baf
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libsystemd/sd-daemon/sd-daemon.c
View file

@ -58,8 +58,7 @@ static void unsetenv_all(bool unset_environment) {
_public_ int sd_listen_fds(int unset_environment) {
const char *e;
unsigned n;
int r, fd;
int n, r, fd;
pid_t pid;
e = getenv("LISTEN_PID");
@ -84,17 +83,23 @@ _public_ int sd_listen_fds(int unset_environment) {
goto finish;
}
r = safe_atou(e, &n);
r = safe_atoi(e, &n);
if (r < 0)
goto finish;
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) n; fd ++) {
assert_cc(SD_LISTEN_FDS_START < INT_MAX);
if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START) {
r = -EINVAL;
goto finish;
}
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) {
r = fd_cloexec(fd, true);
if (r < 0)
goto finish;
}
r = (int) n;
r = n;
finish:
unsetenv_all(unset_environment);