From 0bfb02e3b56abf411882f245655921a91df885ef Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Wed, 30 Dec 2015 14:56:12 +0530 Subject: features/bitrot: add check for corrupted object in f{stat} Backport of http://review.gluster.org/13120 Check for corrupted objects is done bt bitrot stub component for data operations and such fops are denied processing by returning EIO. These checks were not done for operations such as get/set extended attribute, stat and the likes - IOW, stub only blocked pure data operations. However, its necessary to have these checks for certain other fops, most importantly stat (and fstat). This is due to the fact that clients could possibly get stale stat information (such as size, {a,c,m}time) resulting in incorrect operation of the application that rely on these fields. Note that, the data that replication would take care of fetching good (and correct) data, but the staleness of stat information could lead to data inconsistencies (e.g., rebalance, tier). Change-Id: I5a22780373b182a13f8d2c4ca6b7d9aa0ffbfca3 BUG: 1297213 Signed-off-by: Venky Shankar Reviewed-on: http://review.gluster.org/13276 Reviewed-by: Pranith Kumar Karampuri Tested-by: Pranith Kumar Karampuri Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- xlators/features/bit-rot/src/stub/bit-rot-stub.c | 63 ++++++++++++------------ 1 file changed, 31 insertions(+), 32 deletions(-) (limited to 'xlators/features/bit-rot') diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index d082817c67e..5b2d5d70698 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -2768,53 +2768,51 @@ br_stub_lookup (call_frame_t *frame, /** {{{ */ -/* fstat() */ -int br_stub_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *buf, - dict_t *xdata) +/* stat */ +int +br_stub_stat (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) { + int32_t ret = 0; + int32_t op_ret = -1; + int32_t op_errno = EINVAL; - int ret = 0; - br_stub_local_t *local = NULL; - inode_t *inode = NULL; + if (!IA_ISREG (loc->inode->ia_type)) + goto wind; - local = frame->local; - frame->local = NULL; - inode = local->u.context.inode; + ret = br_stub_check_bad_object (this, loc->inode, &op_ret, &op_errno); + if (ret) + goto unwind; - ret = br_stub_mark_xdata_bad_object (this, inode, xdata); - if (ret) { - op_ret = -1; - op_errno = EIO; - } + wind: + STACK_WIND_TAIL (frame, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->stat, loc, xdata); + return 0; - br_stub_cleanup_local(local); - br_stub_dealloc_local(local); - STACK_UNWIND_STRICT (fstat, frame, op_ret, op_errno, buf, xdata); +unwind: + STACK_UNWIND_STRICT (stat, frame, op_ret, op_errno, NULL, NULL); return 0; } +/* fstat */ int br_stub_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - br_stub_local_t *local = NULL; - int32_t op_ret = -1; - int32_t op_errno = EINVAL; + int32_t ret = 0; + int32_t op_ret = -1; + int32_t op_errno = EINVAL; - local = br_stub_alloc_local (this); - if (!local) { - op_ret = -1; - op_errno = ENOMEM; - goto unwind; - } + if (!IA_ISREG (fd->inode->ia_type)) + goto wind; - br_stub_fill_local (local, NULL, fd, fd->inode, fd->inode->gfid, - BR_STUB_NO_VERSIONING, 0); - frame->local = local; + ret = br_stub_check_bad_object (this, fd->inode, &op_ret, &op_errno); + if (ret) + goto unwind; - STACK_WIND (frame, br_stub_fstat_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->fstat, fd, xdata); + wind: + STACK_WIND_TAIL (frame, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->fstat, fd, xdata); return 0; + unwind: STACK_UNWIND_STRICT (fstat, frame, op_ret, op_errno, NULL, NULL); return 0; @@ -3098,6 +3096,7 @@ unblock: struct xlator_fops fops = { .lookup = br_stub_lookup, + .stat = br_stub_stat, .fstat = br_stub_fstat, .open = br_stub_open, .create = br_stub_create, -- cgit