lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 389/757] mm/swapfile.c: fix potential memory leak in sys_swapon
    Date
    From: Miaohe Lin <linmiaohe@huawei.com>

    [ Upstream commit 822bca52ee7eb279acfba261a423ed7ac47d6f73 ]

    If we failed to drain inode, we would forget to free the swap address
    space allocated by init_swap_address_space() above.

    Fixes: dc617f29dbe5 ("vfs: don't allow writes to swap files")
    Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
    Link: https://lkml.kernel.org/r/20200930101803.53884-1-linmiaohe@huawei.com
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    mm/swapfile.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/mm/swapfile.c b/mm/swapfile.c
    index debc94155f74d..b877c1504e00b 100644
    --- a/mm/swapfile.c
    +++ b/mm/swapfile.c
    @@ -3343,7 +3343,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
    error = inode_drain_writes(inode);
    if (error) {
    inode->i_flags &= ~S_SWAPFILE;
    - goto bad_swap_unlock_inode;
    + goto free_swap_address_space;
    }

    mutex_lock(&swapon_mutex);
    @@ -3368,6 +3368,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)

    error = 0;
    goto out;
    +free_swap_address_space:
    + exit_swap_address_space(p->type);
    bad_swap_unlock_inode:
    inode_unlock(inode);
    bad_swap:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:37    [W:5.758 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site