diff options
| author | Raghavendra G <rgowdapp@redhat.com> | 2018-05-25 12:27:43 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2018-05-29 08:44:21 +0000 |
| commit | df838299a8a1732cff9972c9f2377e9c2a4844a0 (patch) | |
| tree | 1c8f9ea20e6f79db49695b85d882caf7f60b32df /xlators/performance | |
| parent | c8a3e8ed1cce774a63b60b2e793b6742920b8cd1 (diff) | |
| download | glusterfs-df838299a8a1732cff9972c9f2377e9c2a4844a0.tar.gz glusterfs-df838299a8a1732cff9972c9f2377e9c2a4844a0.tar.xz glusterfs-df838299a8a1732cff9972c9f2377e9c2a4844a0.zip | |
performance/open-behind: open pending fds before permission change
setattr, posix-acl and selinux changes on a file can revoke permission
to open the file after permission changes. To prevent that, make sure
the pending fd is opened before winding down setattr or setxattr (for
posix-acl and selinux) calls.
Change-Id: Ib0b91795d286072e445190f9a1b3b1e9cd363282
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
fixes: bz#1405147
Diffstat (limited to 'xlators/performance')
| -rw-r--r-- | xlators/performance/open-behind/src/open-behind.c | 61 |
1 files changed, 60 insertions, 1 deletions
diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c index 5d5f8099be..19943ebe84 100644 --- a/xlators/performance/open-behind/src/open-behind.c +++ b/xlators/performance/open-behind/src/open-behind.c @@ -14,6 +14,7 @@ #include "call-stub.h" #include "defaults.h" #include "open-behind-messages.h" +#include "glusterfs-acl.h" typedef struct ob_conf { gf_boolean_t use_anonymous_fd; /* use anonymous FDs wherever safe @@ -811,6 +812,63 @@ err: return 0; } +int32_t +ob_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, + struct iatt *stbuf, int32_t valid, dict_t *xdata) +{ + fd_t *fd = NULL; + call_stub_t *stub = NULL; + + stub = fop_setattr_stub (frame, default_setattr_resume, loc, stbuf, + valid, xdata); + if (!stub) + goto err; + + fd = fd_lookup (loc->inode, 0); + + open_and_resume (this, fd, stub); + if (fd) + fd_unref (fd); + + return 0; +err: + STACK_UNWIND_STRICT (setattr, frame, -1, ENOMEM, NULL, NULL, NULL); + return 0; +} + + +int32_t +ob_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict, + int32_t flags, dict_t *xdata) +{ + fd_t *fd = NULL; + call_stub_t *stub = NULL; + gf_boolean_t access_xattr = _gf_false; + + if (dict_get (dict, POSIX_ACL_DEFAULT_XATTR) + || dict_get (dict, POSIX_ACL_ACCESS_XATTR) + || dict_get (dict, GF_SELINUX_XATTR_KEY)) + access_xattr = _gf_true; + + if (!access_xattr) + return default_setxattr (frame, this, loc, dict, flags, xdata); + + stub = fop_setxattr_stub (frame, default_setxattr_resume, loc, dict, + flags, xdata); + if (!stub) + goto err; + + fd = fd_lookup (loc->inode, 0); + + open_and_resume (this, fd, stub); + if (fd) + fd_unref (fd); + + return 0; +err: + STACK_UNWIND_STRICT (setxattr, frame, -1, ENOMEM, NULL); + return 0; +} int ob_release (xlator_t *this, fd_t *fd) @@ -983,7 +1041,6 @@ fini (xlator_t *this) return; } - struct xlator_fops fops = { .open = ob_open, .readv = ob_readv, @@ -993,12 +1050,14 @@ struct xlator_fops fops = { .fstat = ob_fstat, .ftruncate = ob_ftruncate, .fsetxattr = ob_fsetxattr, + .setxattr = ob_setxattr, .fgetxattr = ob_fgetxattr, .fremovexattr = ob_fremovexattr, .finodelk = ob_finodelk, .fentrylk = ob_fentrylk, .fxattrop = ob_fxattrop, .fsetattr = ob_fsetattr, + .setattr = ob_setattr, .fallocate = ob_fallocate, .discard = ob_discard, .zerofill = ob_zerofill, |