diff options
| author | Justin Clift <justin@gluster.org> | 2014-06-24 20:57:02 +0100 | 
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2014-06-25 04:46:48 -0700 | 
| commit | ecc21940eaa44a38618e8d1d9c9690fffbd5ac72 (patch) | |
| tree | 2243cca8338084168c3eba37e0e0be0caabd0bdf | |
| parent | 33b61346caee59391cd1681623cdac85cbfc04f6 (diff) | |
fuse: fix memory leak in fuse_getxattr()v3.4.5beta1
The fuse_getxattr() function was not freeing fuse_state_t resulting in a
memory leak. As a result, when continuous writes (run dd command in a loop)
were done from a FUSE mount point, the OOM killer killed the client
process (glusterfs).
Manual backport of: http://review.gluster.org/#/c/5392/, provided
by Martin Svec <martin.svec@zoner.cz>.
BUG: 1112844
Change-Id: Ic723675c53384d48c79ad1b11b21c1b17fb56866
Reviewed-on: http://review.gluster.org/8164
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 27 | 
1 files changed, 14 insertions, 13 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index e531970e5c4..da5937b73f3 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3207,6 +3207,7 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)          fuse_state_t *state = NULL;          struct fuse_private *priv = NULL;          int rv = 0; +        int op_errno = EINVAL;          char *newkey = NULL;          priv = this->private; @@ -3227,26 +3228,23 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)                          "%"PRIu64": GETXATTR %s/%"PRIu64" (%s):"                          "refusing positioned getxattr",                          finh->unique, state->loc.path, finh->nodeid, name); -                send_fuse_err (this, finh, EINVAL); -                FREE (finh); -                return; +                op_errno = EINVAL; +                goto err;          }  #endif          if (!priv->acl) {                  if ((strcmp (name, "system.posix_acl_access") == 0) ||                      (strcmp (name, "system.posix_acl_default") == 0)) { -                        send_fuse_err (this, finh, ENOTSUP); -                        GF_FREE (finh); -                        return; +                        op_errno = ENOTSUP; +                        goto err;                  }          }          if (!priv->selinux) {                  if (strncmp (name, "security.", 9) == 0) { -                        send_fuse_err (this, finh, ENODATA); -                        GF_FREE (finh); -                        return; +                        op_errno = ENODATA; +                        goto err;                  }          } @@ -3254,16 +3252,19 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)          rv = fuse_flip_xattr_ns (priv, name, &newkey);          if (rv) { -                send_fuse_err (this, finh, ENOMEM); -                free_fuse_state (state); -                goto out; +                op_errno = ENOMEM; +                goto err;          }          state->size = fgxi->size;          state->name = newkey;          fuse_resolve_and_resume (state, fuse_getxattr_resume); - out: + +        return; + err: +        send_fuse_err (this, finh, op_errno); +        free_fuse_state (state);          return;  }  | 
