From 55e3fefc531f9f8d25c3320536302cf4deaff1b8 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Sun, 30 Sep 2001 00:43:32 +0000 Subject: [PATCH] Close all open file descriptors before restarting sysinstall. PR: bin/30737 Submitted by: Alexey V. Neyman --- usr.sbin/sade/devices.c | 2 ++ usr.sbin/sade/system.c | 7 ++++++- usr.sbin/sysinstall/devices.c | 2 ++ usr.sbin/sysinstall/system.c | 7 ++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index 30993760b192..169d020aaec9 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -273,6 +273,7 @@ deviceGetAll(void) if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) goto skipif; /* Jump over network iface probing */ + close(s); ifflags = ifc.ifc_req->ifr_flags; end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) { @@ -319,6 +320,7 @@ deviceGetAll(void) loopend: if (ifptr->ifr_addr.sa_len) /* I'm not sure why this is here - it's inherited */ ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr)); + close(s); } skipif: diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index b1c2e8ec9a6d..deb9e9f90812 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -56,8 +56,13 @@ intr_reboot(dialogMenuItem *self) static int intr_restart(dialogMenuItem *self) { - int ret; + int ret, fd, fdmax; + + mediaClose(); free_variables(); + fdmax = getdtablesize(); + for (fd = 3; fd < fdmax; fd++) + close(fd); ret = execl(StartName, StartName, (char *)NULL); msgDebug("execl failed (%s)\n", strerror(errno)); /* NOTREACHED */ diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index 30993760b192..169d020aaec9 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/devices.c @@ -273,6 +273,7 @@ deviceGetAll(void) if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) goto skipif; /* Jump over network iface probing */ + close(s); ifflags = ifc.ifc_req->ifr_flags; end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) { @@ -319,6 +320,7 @@ deviceGetAll(void) loopend: if (ifptr->ifr_addr.sa_len) /* I'm not sure why this is here - it's inherited */ ifptr = (struct ifreq *)((caddr_t)ifptr + ifptr->ifr_addr.sa_len - sizeof(struct sockaddr)); + close(s); } skipif: diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index b1c2e8ec9a6d..deb9e9f90812 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -56,8 +56,13 @@ intr_reboot(dialogMenuItem *self) static int intr_restart(dialogMenuItem *self) { - int ret; + int ret, fd, fdmax; + + mediaClose(); free_variables(); + fdmax = getdtablesize(); + for (fd = 3; fd < fdmax; fd++) + close(fd); ret = execl(StartName, StartName, (char *)NULL); msgDebug("execl failed (%s)\n", strerror(errno)); /* NOTREACHED */