| From f39b3f45dbcb0343822cce31ea7636ad66e60bc2 Mon Sep 17 00:00:00 2001 |
| From: Eric Sandeen <sandeen@redhat.com> |
| Date: Sun, 29 Jul 2018 17:13:42 -0400 |
| Subject: ext4: reset error code in ext4_find_entry in fallback |
| |
| From: Eric Sandeen <sandeen@redhat.com> |
| |
| commit f39b3f45dbcb0343822cce31ea7636ad66e60bc2 upstream. |
| |
| When ext4_find_entry() falls back to "searching the old fashioned |
| way" due to a corrupt dx dir, it needs to reset the error code |
| to NULL so that the nonstandard ERR_BAD_DX_DIR code isn't returned |
| to userspace. |
| |
| https://bugzilla.kernel.org/show_bug.cgi?id=199947 |
| |
| Reported-by: Anatoly Trosinenko <anatoly.trosinenko@yandex.com> |
| Reviewed-by: Andreas Dilger <adilger@dilger.ca> |
| Signed-off-by: Eric Sandeen <sandeen@redhat.com> |
| Signed-off-by: Theodore Ts'o <tytso@mit.edu> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/ext4/namei.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/fs/ext4/namei.c |
| +++ b/fs/ext4/namei.c |
| @@ -1397,6 +1397,7 @@ static struct buffer_head * ext4_find_en |
| goto cleanup_and_exit; |
| dxtrace(printk(KERN_DEBUG "ext4_find_entry: dx failed, " |
| "falling back\n")); |
| + ret = NULL; |
| } |
| nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb); |
| if (!nblocks) { |
