diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-05-06 17:08:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-23 15:24:04 -0700 |
| commit | b5914dec1c8ae26f4d540b40a7f8c7ea4f76fc45 (patch) | |
| tree | bf1432f0740bda7f531e8b3c07a0ce12845d5119 /fs | |
| parent | ee4a3a8203eea2970e2347e2aaf2ba04c0116fff (diff) | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/sb.c | 3 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 57085e43320f..238ad158340f 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -474,7 +474,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 333e181ee987..8440ba834d52 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1550,6 +1550,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; } |