tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix execv arguments in a way less likely to cause grief
 for -portable; ok dtucker@

Upstream-ID: 5902bf0ea0371f39f1300698dc3b8e4105fc0fc5
This commit is contained in:
djm@openbsd.org 2015-10-27 08:54:52 +00:00 committed by Damien Miller
parent 63d188175a
commit a4aef3ed29
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.244 2015/10/27 00:49:53 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.245 2015/10/27 08:54:52 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -458,7 +458,7 @@ execute_in_shell(const char *cmd)
/* Fork and execute the command. */ /* Fork and execute the command. */
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
char *argv[] = { shell, "-c", xstrdup(cmd), NULL }; char *argv[4];
/* Child. Permanently give up superuser privileges. */ /* Child. Permanently give up superuser privileges. */
permanently_drop_suid(original_real_uid); permanently_drop_suid(original_real_uid);
@ -472,6 +472,11 @@ execute_in_shell(const char *cmd)
close(devnull); close(devnull);
closefrom(STDERR_FILENO + 1); closefrom(STDERR_FILENO + 1);
argv[0] = shell;
argv[1] = "-c";
argv[2] = xstrdup(cmd);
argv[3] = NULL;
execv(argv[0], argv); execv(argv[0], argv);
error("Unable to execute '%.100s': %s", cmd, strerror(errno)); error("Unable to execute '%.100s': %s", cmd, strerror(errno));
/* Die with signal to make this error apparent to parent. */ /* Die with signal to make this error apparent to parent. */