lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 015/105] autofs: fix a leak in autofs_expire_indirect()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    [ Upstream commit 03ad0d703df75c43f78bd72e16124b5b94a95188 ]

    if the second call of should_expire() in there ends up
    grabbing and returning a new reference to dentry, we need
    to drop it before continuing.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/autofs/expire.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c
    index cdff0567aacb3..2d01553a6d586 100644
    --- a/fs/autofs/expire.c
    +++ b/fs/autofs/expire.c
    @@ -498,9 +498,10 @@ static struct dentry *autofs_expire_indirect(struct super_block *sb,
    */
    how &= ~AUTOFS_EXP_LEAVES;
    found = should_expire(expired, mnt, timeout, how);
    - if (!found || found != expired)
    - /* Something has changed, continue */
    + if (found != expired) { // something has changed, continue
    + dput(found);
    goto next;
    + }

    if (expired != dentry)
    dput(dentry);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-11 17:02    [W:2.240 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site