| From f0f6d0d43c40517079a4cb7447818a266e682852 Mon Sep 17 00:00:00 2001 |
| From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> |
| Date: Fri, 6 May 2011 17:08:56 +0300 |
| Subject: [PATCH] UBIFS: fix a rare memory leak in ro to rw remounting path |
| |
| commit eaeee242c531cd4b0a4a46e8b5dd7ef504380c42 upstream. |
| |
| When re-mounting from R/O mode to R/W mode and the LEB count in the superblock |
| is not up-to date, because for the underlying UBI volume became larger, we |
| re-write the superblock. We allocate RAM for these purposes, but never free it. |
| So this is a memory leak, although very rare one. |
| |
| Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/ubifs/sb.c | 3 ++- |
| fs/ubifs/super.c | 1 + |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c |
| index 96cb62c..f75f89b 100644 |
| --- a/fs/ubifs/sb.c |
| +++ b/fs/ubifs/sb.c |
| @@ -475,7 +475,8 @@ failed: |
| * @c: UBIFS file-system description object |
| * |
| * This function returns a pointer to the superblock node or a negative error |
| - * code. |
| + * code. Note, the user of this function is responsible of kfree()'ing the |
| + * returned superblock buffer. |
| */ |
| struct ubifs_sb_node *ubifs_read_sb_node(struct ubifs_info *c) |
| { |
| diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c |
| index 4d2f215..f4d0c36 100644 |
| --- a/fs/ubifs/super.c |
| +++ b/fs/ubifs/super.c |
| @@ -1545,6 +1545,7 @@ static int ubifs_remount_rw(struct ubifs_info *c) |
| } |
| sup->leb_cnt = cpu_to_le32(c->leb_cnt); |
| err = ubifs_write_sb_node(c, sup); |
| + kfree(sup); |
| if (err) |
| goto out; |
| } |
| -- |
| 1.7.9.3 |
| |