mydaemon: remove closeall() calls from mydaemon()
Subsystems (2)
PATCH 1/1 mydaemon: remove closeall() calls from mydaemon()
idmapd and svcgssd have a mydaemon() routine that uses closeall() to close file descriptors. Unfortunately, they aren't using it correctly and it ends up closing the pipe that the child process uses to talk to its parent.
Fix this by not using closeall() in this routine and instead, just close the file descriptors that we know need to be closed. If /dev/null can't be opened for some reason, then just have the child exit with a non-zero error.
--- utils/gssd/svcgssd.c | 14 ++++++++++---- utils/idmapd/idmapd.c | 9 ++++++--- 2 files changed, 16 insertions(+), 7 deletions(-)
utils/gssd/svcgssd.c +10 -4
@@ -117,10 +117,16 @@ mydaemon(int nochdir, int noclose)if (noclose ==0 ) { tempfd =open ("/dev/null" ,O_RDWR ); -dup2 (tempfd,0 ); -dup2 (tempfd,1 ); -dup2 (tempfd,2 ); -closeall (3 ); +if (tempfd >=0 ) { +dup2 (tempfd,0 ); +dup2 (tempfd,1 ); +dup2 (tempfd,2 ); +close (tempfd); + }else { +printerr (1 ,"mydaemon: can't open /dev/null: errno %d " +"(%s)\n" , errno,strerror (errno)); +exit (1 ); + } }return ;
utils/idmapd/idmapd.c +6 -3
@@ -978,9 +978,12 @@ mydaemon(int nochdir, int noclose)dup2 (tempfd,0 );dup2 (tempfd,1 );dup2 (tempfd,2 ); -closeall (3 ); - }else -closeall (0 ); +close (tempfd); + }else { +err (1 ,"mydaemon: can't open /dev/null: errno %d" , + errno); +exit (1 ); + } }return ;
Signature · 1 line
1.6.0.6
Quoted 11 lines · Jeff Layton
idmapd and svcgssd have a
mydaemon()routine that usescloseall()to close file descriptors. Unfortunately, they aren't using it correctly and it ends up closing the pipe that the child process uses to talk to its parent.Fix this by not using
closeall()in this routine and instead, just close the file descriptors that we know need to be closed. If/dev/nullcan't be opened for some reason, then just have the child exit with a non-zero error.Signed-off-by Jeff Layton <[email protected]>
Committed...
steved.