diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-23 02:18:03 +0530 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-23 02:18:03 +0530 |
| commit | ef1312fb2e17d15d695dc29be9c3abc25584ba10 (patch) | |
| tree | 0d1ca2907c3284fb1190234a12b0a489c765e907 /trans | |
| parent | 28d8dd078448af0f964bbdf408374c08ccbcc84a (diff) | |
fakeroot: Fix reopening files after a chmod
Huge thanks to Svante Signell for having tracked the bug.
* trans/fakeroot.c (netfs_attempt_chmod): Make the file_chmod call
additionally include the modes from nn->openmodes.
Diffstat (limited to 'trans')
| -rw-r--r-- | trans/fakeroot.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/trans/fakeroot.c b/trans/fakeroot.c index 51be60cd..63303a09 100644 --- a/trans/fakeroot.c +++ b/trans/fakeroot.c @@ -544,14 +544,28 @@ real_from_fake_mode (mode_t mode) error_t netfs_attempt_chmod (struct iouser *cred, struct node *np, mode_t mode) { + struct netnode *nn; + mode_t real_mode; + if ((mode & S_IFMT) == 0) mode |= np->nn_stat.st_mode & S_IFMT; if ((mode & S_IFMT) != (np->nn_stat.st_mode & S_IFMT)) return EOPNOTSUPP; + /* Make sure that `check_openmodes' will still always be able to reopen + it. */ + real_mode = mode; + nn = netfs_node_netnode (np); + if (nn->openmodes & O_READ) + real_mode |= S_IRUSR; + if (nn->openmodes & O_WRITE) + real_mode |= S_IWUSR; + if (nn->openmodes & O_EXEC) + real_mode |= S_IXUSR; + /* We don't bother with error checking since the fake mode change should always succeed--worst case a later open will get EACCES. */ - (void) file_chmod (netfs_node_netnode (np)->file, mode); + (void) file_chmod (nn->file, real_mode); set_faked_attribute (np, FAKE_MODE); np->nn_stat.st_mode = mode; return 0; |