[PATCH] isofs: memory leaks when reading corrupted filesystems.

[PATCH] isofs: memory leaks when reading corrupted filesystems.

[Quentin Casasnovas]

Vegard and I found that when a directory on isofs is corrupted, we are not
releasing the associated buffer_head, leading to a memory leak.  This was
introduced by:

 2deb1acc653c ("isofs: fix access to unallocated memory when reading corrupted filesystem")

This was found by fuzzing.

Cc: <stable@vger.kernel.org>
Cc: Jan Kara <jack@suse.cz>
Fixes: 2deb1acc653c ("isofs: fix access to unallocated memory when reading...")
Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Tested-by: Vegard Nossum <vegard.nossum@oracle.com>
---
 fs/isofs/dir.c   | 1 +
 fs/isofs/namei.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c
index b943cbd..2e7d74c 100644
--- a/fs/isofs/dir.c
+++ b/fs/isofs/dir.c
@@ -151,6 +151,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *file,
 			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
 			       " in block %lu of inode %lu\n", block,
 			       inode->i_ino);
+			brelse(bh);
 			return -EIO;
 		}
 
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 7b543e6..696f255 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -101,6 +101,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,
 			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
 			       " in block %lu of inode %lu\n", block,
 			       dir->i_ino);
+			brelse(bh);
 			return 0;
 		}
 
-- 
2.4.9

Re: [PATCH] isofs: memory leaks when reading corrupted filesystems.

[Jan Kara]

On Sat 05-12-15 18:05:42, Quentin Casasnovas wrote:
> Vegard and I found that when a directory on isofs is corrupted, we are not
> releasing the associated buffer_head, leading to a memory leak.  This was
> introduced by:
> 
>  2deb1acc653c ("isofs: fix access to unallocated memory when reading corrupted filesystem")
> 
> This was found by fuzzing.

Good catch. Thanks! You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> Cc: <stable@vger.kernel.org>
> Cc: Jan Kara <jack@suse.cz>
> Fixes: 2deb1acc653c ("isofs: fix access to unallocated memory when reading...")
> Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
> Tested-by: Vegard Nossum <vegard.nossum@oracle.com>
> ---
>  fs/isofs/dir.c   | 1 +
>  fs/isofs/namei.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c
> index b943cbd..2e7d74c 100644
> --- a/fs/isofs/dir.c
> +++ b/fs/isofs/dir.c
> @@ -151,6 +151,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *file,
>  			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
>  			       " in block %lu of inode %lu\n", block,
>  			       inode->i_ino);
> +			brelse(bh);
>  			return -EIO;
>  		}
>  
> diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
> index 7b543e6..696f255 100644
> --- a/fs/isofs/namei.c
> +++ b/fs/isofs/namei.c
> @@ -101,6 +101,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,
>  			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
>  			       " in block %lu of inode %lu\n", block,
>  			       dir->i_ino);
> +			brelse(bh);
>  			return 0;
>  		}
>  
> -- 
> 2.4.9
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Re: [PATCH] isofs: memory leaks when reading corrupted filesystems.

[Jan Kara]

On Sat 05-12-15 18:05:42, Quentin Casasnovas wrote:
> Vegard and I found that when a directory on isofs is corrupted, we are not
> releasing the associated buffer_head, leading to a memory leak.  This was
> introduced by:
> 
>  2deb1acc653c ("isofs: fix access to unallocated memory when reading corrupted filesystem")
> 
> This was found by fuzzing.
> 
> Cc: <stable@vger.kernel.org>
> Cc: Jan Kara <jack@suse.cz>
> Fixes: 2deb1acc653c ("isofs: fix access to unallocated memory when reading...")
> Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
> Tested-by: Vegard Nossum <vegard.nossum@oracle.com>

BTW, please CC Andrew Morton since he usually merges isofs patches. Thanks!

								Honza
> ---
>  fs/isofs/dir.c   | 1 +
>  fs/isofs/namei.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c
> index b943cbd..2e7d74c 100644
> --- a/fs/isofs/dir.c
> +++ b/fs/isofs/dir.c
> @@ -151,6 +151,7 @@ static int do_isofs_readdir(struct inode *inode, struct file *file,
>  			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
>  			       " in block %lu of inode %lu\n", block,
>  			       inode->i_ino);
> +			brelse(bh);
>  			return -EIO;
>  		}
>  
> diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
> index 7b543e6..696f255 100644
> --- a/fs/isofs/namei.c
> +++ b/fs/isofs/namei.c
> @@ -101,6 +101,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry,
>  			printk(KERN_NOTICE "iso9660: Corrupted directory entry"
>  			       " in block %lu of inode %lu\n", block,
>  			       dir->i_ino);
> +			brelse(bh);
>  			return 0;
>  		}
>  
> -- 
> 2.4.9
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR