diff options
| author | Homma <homma@allworks.co.jp> | 2019-07-05 16:10:41 +0530 |
|---|---|---|
| committer | hari gowtham <hari.gowtham005@gmail.com> | 2019-12-06 10:31:19 +0000 |
| commit | f0f042780e5e8796a6a8e8fd9935fdc7bd974527 (patch) | |
| tree | c7483f01eb505d871c48d70471c78e4fc81363a3 | |
| parent | aa60bea1753bb744c892b669a3e693803b0db385 (diff) | |
system/posix-acl: update ctx only if iatt is non-NULL
We need to safe-guard against possible zero'ing out of iatt
structure in acl ctx, which can cause many issues.
Backport of:
> fixes: bz#1668286
> Change-Id: Ie81a57d7453a6624078de3be8c0845bf4d432773
> Signed-off-by: Amar Tumballi <amarts@redhat.com>
(cherry-picked from commit 6bf9637a93011298d032332ca93009ba4e377e46)
fixes: bz#1767305
Change-Id: Ie81a57d7453a6624078de3be8c0845bf4d432773
Signed-off-by: Alan Orth <alan.orth@gmail.com>
| -rw-r--r-- | xlators/system/posix-acl/src/posix-acl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xlators/system/posix-acl/src/posix-acl.c b/xlators/system/posix-acl/src/posix-acl.c index 9183105ca00..83ea28f541c 100644 --- a/xlators/system/posix-acl/src/posix-acl.c +++ b/xlators/system/posix-acl/src/posix-acl.c @@ -875,6 +875,13 @@ posix_acl_ctx_update(inode_t *inode, xlator_t *this, struct iatt *buf, int ret = 0; int i = 0; + if (!buf || !buf->ia_ctime) { + /* No need to update ctx if buf is empty */ + gf_log_callingfn(this->name, GF_LOG_DEBUG, "iatt struct is empty (%d)", + fop); + goto out; + } + LOCK(&inode->lock); { ctx = __posix_acl_ctx_get(inode, this, _gf_true); @@ -928,6 +935,7 @@ posix_acl_ctx_update(inode_t *inode, xlator_t *this, struct iatt *buf, } unlock: UNLOCK(&inode->lock); +out: return ret; } |