d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From njw@cs.city.ac.uk (Nick Williams):

Browse Source 
/sbin/umount does not return the correct exit status due to incorrect
logic in its internals.

Further, because of the nature of the code, you *cannot* use it to
umount a directory from a union mountpoint. Well, you can sometimes,
it depends on if the directory is at the top of the union stack or not :)

Submitted by:	njw@cs.city.ac.uk (Nick Williams)
This commit is contained in:
David Greenman 1994-11-04 17:51:37 +00:00
parent fce9eaf109
commit 5974081cea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=4142
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/umount/umount.8
View File

@ -116,6 +116,28 @@ file system table
.Xr unmount 2 ,
.Xr fstab 5 ,
.Xr mount 8
.Sh BUGS
When using union filesystems,
.Xr umount 8
cannot always determine the node which is the mountpoint.
In this case,
it is necessary to specify the relevant directory to be unmounted
in the same form as that displayed by
.Xr mount 8 .
For example, given a mount entry like this:
.Bd -literal -offset indent
<above>/tmpdir on /cdrom (local, user mount)
.Ed
.Pp
then the command:
.Bd -literal -offset indent
umount '<above>/tmpdir'
.Ed
.Pp
would unmount
.Ar /tmpdir
from the mountpoint
.Ar /cdrom .
.Sh HISTORY
A
.Nm umount

8
sbin/umount/umount.c
View File

@ -128,8 +128,7 @@ main(argc, argv)
errs = umountall();
} else
for (errs = 0; *argv != NULL; ++argv)
if (umountfs(*argv) == 0)
errs = 1;
errs += umountfs(*argv);
exit(errs);
}
@ -174,6 +173,7 @@ umountall()
return (0);
}
/* Returns 1 on failure, 0 on success */
int
umountfs(name)
char *name;
@ -188,8 +188,8 @@ umountfs(name)
char *delimp, *hostp, *mntpt, rname[MAXPATHLEN];
if (realpath(name, rname) == NULL) {
warn("%s", rname);
return (0);
/* Continue and let the system call check it... */
strcpy(rname, name);
}
name = rname;