Skip to content

Commit

Permalink
src: ensure that file descriptors 0-2 are valid
Browse files Browse the repository at this point in the history
Check that stdin, stdout and stderr map to open file descriptors and
remap them to /dev/null if that isn't the case.  Protects against
information leaks or worse when io.js is started with closed stdio
file descriptors.

PR-URL: #875
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Vladimir Kurchatkin <[email protected]>
  • Loading branch information
bnoordhuis committed Feb 18, 2015
1 parent a956791 commit b5f25a9
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
17 changes: 16 additions & 1 deletion src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3366,7 +3366,22 @@ inline void PlatformInit() {
sigset_t sigmask;
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGUSR1);
CHECK_EQ(0, pthread_sigmask(SIG_SETMASK, &sigmask, nullptr));
const int err = pthread_sigmask(SIG_SETMASK, &sigmask, nullptr);

// Make sure file descriptors 0-2 are valid before we start logging anything.
for (int fd = STDIN_FILENO; fd <= STDERR_FILENO; fd += 1) {
struct stat ignored;
if (fstat(fd, &ignored) == 0)
continue;
// Anything but EBADF means something is seriously wrong. We don't
// have to special-case EINTR, fstat() is not interruptible.
if (errno != EBADF)
abort();
if (fd != open("/dev/null", O_RDWR))
abort();
}

CHECK_EQ(err, 0);

// Restore signal dispositions, the parent process may have changed them.
struct sigaction act;
Expand Down
24 changes: 24 additions & 0 deletions test/parallel/test-stdio-closed.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;

if (process.platform === 'win32') {
console.log('Skipping test, platform not supported.');
return;
}

if (process.argv[2] === 'child') {
process.stdout.write('stdout', function() {
process.stderr.write('stderr', function() {
process.exit(42);
});
});
}

// Run the script in a shell but close stdout and stderr.
var cmd = '"' + process.execPath + '" "' + __filename + '" child 1>&- 2>&-';
var proc = spawn('/bin/sh', ['-c', cmd], { stdio: 'inherit' });

proc.on('exit', common.mustCall(function(exitCode) {
assert.equal(exitCode, 42);
}));

0 comments on commit b5f25a9

Please sign in to comment.