From: Artem Bityutskiy Date: Fri, 6 May 2011 14:08:56 +0000 (+0300) Subject: UBIFS: fix a rare memory leak in ro to rw remounting path X-Git-Tag: v2.6.33.15~48 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2776f63f585549c582b34db8e0b9688caead22ef;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- 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 43f9d19a6f33..4ccc5d9a51fe 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; }