bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unlink_file: strip trailing slashes

Browse source 
If the user replaces a directory with a symlink, libalpm would get
confused because the trailing slash causes system calls to resolve the
symlink.  This leads to errors and a misleading message during upgrades.
Even though libalpm does not support this, it should not be giving
misleading errors.

Also adds an overflow check.

Fixes FS#51377

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
(cherry picked from commit 16b91f798f)
This commit is contained in:
Andrew Gregory 2017-04-09 19:49:17 -04:00
parent 908769b540
commit 0fd8455c66
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/libalpm/remove.c
View file

@ -440,8 +440,19 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg,
{ {
struct stat buf; struct stat buf;
char file[PATH_MAX]; char file[PATH_MAX];
int file_len;
snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name); file_len = snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name);
if(file_len <= 0 || file_len >= PATH_MAX) {
/* 0 is a valid value from snprintf, but should be impossible here */
_alpm_log(handle, ALPM_LOG_DEBUG, "path too long to unlink %s%s\n",
handle->root, fileobj->name);
return -1;
} else if(file[file_len-1] == '/') {
/* trailing slashes cause errors and confusing messages if the user has
* replaced a directory with a symlink */
file[--file_len] = '\0';
}
if(llstat(file, &buf)) { if(llstat(file, &buf)) {
_alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file);

1
test/pacman/tests/TESTS
View file

@ -109,6 +109,7 @@ TESTS += test/pacman/tests/querycheck002.py
TESTS += test/pacman/tests/querycheck_fast_file_type.py TESTS += test/pacman/tests/querycheck_fast_file_type.py
TESTS += test/pacman/tests/reason001.py TESTS += test/pacman/tests/reason001.py
TESTS += test/pacman/tests/remove-assumeinstalled.py TESTS += test/pacman/tests/remove-assumeinstalled.py
TESTS += test/pacman/tests/remove-directory-replaced-with-symlink.py
TESTS += test/pacman/tests/remove-optdepend-of-installed-package.py TESTS += test/pacman/tests/remove-optdepend-of-installed-package.py
TESTS += test/pacman/tests/remove-recursive-cycle.py TESTS += test/pacman/tests/remove-recursive-cycle.py
TESTS += test/pacman/tests/remove001.py TESTS += test/pacman/tests/remove001.py

16
test/pacman/tests/remove-directory-replaced-with-symlink.py Normal file
View file

@ -0,0 +1,16 @@
self.description = "remove a package with a directory that has been replaced with a symlink"
self.filesystem = [ "var/", "srv -> var/" ]
lpkg = pmpkg("pkg1")
lpkg.files = ["srv/"]
self.addpkg2db("local", lpkg)
self.args = "-R %s" % (lpkg.name)
self.addrule("PACMAN_RETCODE=0")
self.addrule("DIR_EXIST=var/")
self.addrule("!LINK_EXIST=srv")
self.addrule("!FILE_EXIST=srv")
self.addrule("!DIR_EXIST=srv")
self.addrule("!PACMAN_OUTPUT=cannot remove")