diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2019-07-11 18:57:13 +0800 |
|---|---|---|
| committer | Kinglong Mee <kinglongmee@gmail.com> | 2019-07-17 09:02:11 +0800 |
| commit | 477bbe36dc2a05e00ffb137450fa18a0aba8bf6a (patch) | |
| tree | e2e33f1d8aea82b16732c12c5b8a2b9a010b54cb /xlators/cluster/ec/src/ec-dir-read.c | |
| parent | 11de436ba7ef4cc1f583609f2482b1008607d410 (diff) | |
cluster/ec: skip updating ctx->loc again when ec_fix_open/opendir
The ec_manager_open/opendir memsets ctx->loc which causes
memory/inode leak, and ec_fheal uses ctx->loc out of fd->lock
that loc_copy may copy bad data when memset it.
This patch skips updating ctx->loc when it is initilizaed.
With it, ctx->loc is filled once, and never updated.
Change-Id: I3bf5ffce4caf4c1c667f7acaa14b451d37a3550a
fixes: bz#1729772
Signed-off-by: Kinglong Mee <mijinlong@horiscale.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-dir-read.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-dir-read.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xlators/cluster/ec/src/ec-dir-read.c b/xlators/cluster/ec/src/ec-dir-read.c index c3c6b89dba7..ef6b06fa4dd 100644 --- a/xlators/cluster/ec/src/ec-dir-read.c +++ b/xlators/cluster/ec/src/ec-dir-read.c @@ -123,13 +123,15 @@ ec_manager_opendir(ec_fop_data_t *fop, int32_t state) return EC_STATE_REPORT; } - err = ec_loc_from_loc(fop->xl, &ctx->loc, &fop->loc[0]); - if (err != 0) { - UNLOCK(&fop->fd->lock); + if (!ctx->loc.inode) { + err = ec_loc_from_loc(fop->xl, &ctx->loc, &fop->loc[0]); + if (err != 0) { + UNLOCK(&fop->fd->lock); - fop->error = -err; + fop->error = -err; - return EC_STATE_REPORT; + return EC_STATE_REPORT; + } } UNLOCK(&fop->fd->lock); |