diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2015-11-02 20:53:54 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-11-02 20:53:54 -0500 |
commit | 09cb22d2a57b51d7d052dfe508f260abc67b69b6 (patch) | |
tree | 62713e458b2c302b69648a2bf4723d3f2467e2a1 | |
parent | 86a21c79745ca97676cbd47f8608839382cc0448 (diff) |
xfs: Plug memory leak in xfs_attrmulti_attr_set
When setting attributes via XFS_IOC_ATTRMULTI_BY_HANDLE, the user-space
buffer is copied into a new kernel-space buffer via memdup_user; that
buffer then isn't freed.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r-- | fs/xfs/xfs_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index ea7d85af5310..e939c20cb4de 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c | |||
@@ -482,6 +482,7 @@ xfs_attrmulti_attr_set( | |||
482 | __uint32_t flags) | 482 | __uint32_t flags) |
483 | { | 483 | { |
484 | unsigned char *kbuf; | 484 | unsigned char *kbuf; |
485 | int error; | ||
485 | 486 | ||
486 | if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) | 487 | if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) |
487 | return -EPERM; | 488 | return -EPERM; |
@@ -492,7 +493,9 @@ xfs_attrmulti_attr_set( | |||
492 | if (IS_ERR(kbuf)) | 493 | if (IS_ERR(kbuf)) |
493 | return PTR_ERR(kbuf); | 494 | return PTR_ERR(kbuf); |
494 | 495 | ||
495 | return xfs_attr_set(XFS_I(inode), name, kbuf, len, flags); | 496 | error = xfs_attr_set(XFS_I(inode), name, kbuf, len, flags); |
497 | kfree(kbuf); | ||
498 | return error; | ||
496 | } | 499 | } |
497 | 500 | ||
498 | int | 501 | int |