summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorluneo7 <luneo7@gmail.com>2017-10-10 17:17:35 -0300
committerShyamsundar Ranganathan <srangana@redhat.com>2017-10-25 14:03:28 +0000
commitbe662aa3007898c22ad2e9d23db63f2e88a6d434 (patch)
tree674580e53be13b3959445c7fbbdb7cae94ce3d6a /xlators
parent12404624ac94e0561170991f39bb3e8444022a97 (diff)
features/worm: Adding check to newloc when doing rename
Problem: Since rename didn't check if newloc exists and it's retention state it was possible to rename a new file that wasn't in retention over a existing file that was in read-only state. Cherry picked from commit 00a4dc0: > Change-Id: I63c6bbabb7bb456ebedf201cc77b878ffda62229 > BUG: 1484490 > Signed-off-by: luneo7 <luneo7@gmail.com> > Reviewed-on: https://review.gluster.org/18104 > Tested-by: jiffin tony Thottan <jthottan@redhat.com> > Tested-by: Prashanth Pai <ppai@redhat.com> > Smoke: Gluster Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Prashanth Pai <ppai@redhat.com> > Reviewed-by: Karthik U S <ksubrahm@redhat.com> > Reviewed-by: Amar Tumballi <amarts@redhat.com> Change-Id: I63c6bbabb7bb456ebedf201cc77b878ffda62229 BUG: 1480788 Signed-off-by: luneo7 <luneo7@gmail.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/features/read-only/src/worm.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c
index c7f9b9288dd..24ae5f6be8b 100644
--- a/xlators/features/read-only/src/worm.c
+++ b/xlators/features/read-only/src/worm.c
@@ -137,10 +137,24 @@ worm_rename (call_frame_t *frame, xlator_t *this,
gf_uuid_copy (oldloc->gfid, oldloc->inode->gfid);
if (is_wormfile (this, _gf_false, oldloc)) {
op_errno = 0;
- goto out;
+ goto check_newloc;
}
op_errno = gf_worm_state_transition (this, _gf_false, oldloc,
- GF_FOP_RENAME);
+ GF_FOP_RENAME);
+
+ if (op_errno == 0) {
+check_newloc:
+ if (newloc->inode != NULL) {
+ gf_uuid_copy (newloc->gfid, newloc->inode->gfid);
+ if (is_wormfile (this, _gf_false, newloc)) {
+ op_errno = 0;
+ goto out;
+ }
+ op_errno = gf_worm_state_transition (this, _gf_false,
+ newloc,
+ GF_FOP_RENAME);
+ }
+ }
out:
if (op_errno)