From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ED18C432C0 for ; Wed, 27 Nov 2019 21:26:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB8F4215A5 for ; Wed, 27 Nov 2019 21:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890018; bh=HE5vjgSPVIYyamxX1g17Nmv7Viq54oqMyZMyPewWjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZCRf6D9S20wlEdtfeLxp72pVUM0YafgYbnxxgEP8B0WMBAecVEOq+dYvsZX/zHhUe J2l4gsp6VaSk9wV+oNLtbuxds01fNASx174gWRDrIUaFOjS5+4Xh3fYBvcAnxbsVLe FwtriO8ZglxDWLzGuGrlJd0YECFBN3fSbXyvA28U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731500AbfK0VAA (ORCPT ); Wed, 27 Nov 2019 16:00:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:51576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731486AbfK0U7y (ORCPT ); Wed, 27 Nov 2019 15:59:54 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E3D642158A; Wed, 27 Nov 2019 20:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888394; bh=HE5vjgSPVIYyamxX1g17Nmv7Viq54oqMyZMyPewWjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XsVMZ3RLijSM95ZgF/PIuqc9WDWVejh03xfOKt8TGWA2j/erW/kJmwGghCoyYQBwR +6pl/gawOuaWa8bPXEsJLjlm6n7YWdo28skQx8Bh027n4MWWPoYmy/nPRVVzzkIqtf ZFxUvkY1FKhJVPJoLxEX2eWX+GfbeL4h3gqG4ywE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Yan, Zheng" , Jeff Layton , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.19 117/306] ceph: fix dentry leak in ceph_readdir_prepopulate Date: Wed, 27 Nov 2019 21:29:27 +0100 Message-Id: <20191127203123.714067070@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yan, Zheng [ Upstream commit c58f450bd61511d897efc2ea472c69630635b557 ] Signed-off-by: "Yan, Zheng" Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/inode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index acb70a6a82f0f..1e438e0faf77e 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1694,7 +1694,6 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, if (IS_ERR(realdn)) { err = PTR_ERR(realdn); d_drop(dn); - dn = NULL; goto next_item; } dn = realdn; -- 2.20.1