RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-11 16:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libselinux: selinux_restorecon: fix realpath logic

Browse Source 
The realpath logic in selinux_restorecon() was taken from the
Android libselinux fork.  However, bionic dirname() and basename()
do not modify their argument and therefore are safe to call on a
const string.  POSIX dirname() and basename() can modify their argument.
There is a GNU basename() that does not modify its argument, but not
for dirname().
For portability, create copies of the original pathname for each call
and keep them around until finished using the result.

Fixes "restorecon -r goes up the tree?" bug reported by Jason Zaman.

Reported-by: Jason Zaman <jason@perfinion.com>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
Stephen Smalley 2016-10-05 10:45:35 -04:00
parent 90dd84b133
commit aa0c824bb2
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libselinux/src/selinux_restorecon.c
View File

@ -797,25 +797,41 @@ int selinux_restorecon(const char *pathname_orig,
* realpath of containing dir, then appending last component name.
*/
if (flags.userealpath) {
pathbname = basename((char *)pathname_orig);
char *basename_cpy = strdup(pathname_orig);
if (!basename_cpy)
goto realpatherr;
pathbname = basename(basename_cpy);
if (!strcmp(pathbname, "/") || !strcmp(pathbname, ".") ||
!strcmp(pathbname, "..")) {
pathname = realpath(pathname_orig, NULL);
if (!pathname)
if (!pathname) {
free(basename_cpy);
goto realpatherr;
}
} else {
pathdname = dirname((char *)pathname_orig);
pathdnamer = realpath(pathdname, NULL);
if (!pathdnamer)
char *dirname_cpy = strdup(pathname_orig);
if (!dirname_cpy) {
free(basename_cpy);
goto realpatherr;
}
pathdname = dirname(dirname_cpy);
pathdnamer = realpath(pathdname, NULL);
free(dirname_cpy);
if (!pathdnamer) {
free(basename_cpy);
goto realpatherr;
}
if (!strcmp(pathdnamer, "/"))
error = asprintf(&pathname, "/%s", pathbname);
else
error = asprintf(&pathname, "%s/%s",
pathdnamer, pathbname);
if (error < 0)
if (error < 0) {
free(basename_cpy);
goto oom;
}
}
free(basename_cpy);
} else {
pathname = strdup(pathname_orig);
if (!pathname)