]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ext4: initialize retries variable in ext4_da_write_inline_data_begin()
authorLukas Czerner <lczerner@redhat.com>
Wed, 3 Oct 2018 01:18:45 +0000 (21:18 -0400)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:57:15 +0000 (19:57 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836802
commit 625ef8a3acd111d5f496d190baf99d1a815bd03e upstream.

Variable retries is not initialized in ext4_da_write_inline_data_begin()
which can lead to nondeterministic number of retries in case we hit
ENOSPC. Initialize retries to zero as we do everywhere else.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Fixes: bc0ca9df3b2a ("ext4: retry allocation when inline->extent conversion failed")
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/ext4/inline.c

index 5ef94172a0628786373ff5012beb020371367fd6..ad763ce7323d3b680b94ae86d2fd166546f984d3 100644 (file)
@@ -870,7 +870,7 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
        handle_t *handle;
        struct page *page;
        struct ext4_iloc iloc;
-       int retries;
+       int retries = 0;
 
        ret = ext4_get_inode_loc(inode, &iloc);
        if (ret)