Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp772236ybc; Sat, 16 Nov 2019 08:25:09 -0800 (PST) X-Google-Smtp-Source: APXvYqwytoEJ4Nbctbm22xSPFfFEFCewaFeYS0ZoIPGiRZFgBXCyKjzqD5PdgFb/AyXU6rGi54fO X-Received: by 2002:a17:906:1d59:: with SMTP id o25mr10867066ejh.17.1573921509667; Sat, 16 Nov 2019 08:25:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573921509; cv=none; d=google.com; s=arc-20160816; b=VsvbWy6tTDefzX/pIpKjMxuMQ8H5WZjt/h6mvGRrK/isQozsL3ePkAFUbDkqNE1JSB FilQ2YYiNG0jISq6dkfmznBIubaahKEjTEhah3cP3Z2RJntxNV/5hCkSYn09sCH+yEwN lm1eEtyDUqNiWR6JVRGlMUh88KSCLzVJLIVsuuHg/6GzGqiysyrNVIGmikQ4Vj7cPBNx VSIXCy+JqObno+2JNHMlPXaO4E6rkHghIUHU6OAgL7/RcJ4G3U7G2cpUNa8VpGrj9GPy lLOMHulBMUylbDtCWyVFz6xP8CUdYKnMOuuva5gE6AfaHYr/ASjZOaTeSuB5Bo22qSRc 4RwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=px7sQxU+bF4XQP8iBe2QKz+oiFTb56ntA7NBKCiJfXg=; b=EW7VgnPnq5QD9FbHmDBdghQaH2dnBeuZsBlX5LjhD3iOMU4/hfUjtLswHmuAIRwatn DvpjpBzf/zWBdfho7+fk41UiR+lrggHtAe7O1PbJeWADYLTXxrBfWozFmy6uiAWOWptC NuW5kNN+yz/NeeRF0bpBt6L6I1/34D9VAQbytY46+Z3vZIsvA0kZkT5l2Whagjf913E2 JIM3JSPXQSjRpDA49L6uLIQ+kFaH+cp3Gv1kU8c9s16+VEGsgcY2Qu78i5NRFYALe7nW ZLkinVYoHja7brcSewm1qtd5JyGaJ6RahS0wmbCrHnHvwCpMk4O/byQUJDEzetExT9l1 YxrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zJDBLU0B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8si8063180ejt.321.2019.11.16.08.24.45; Sat, 16 Nov 2019 08:25:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zJDBLU0B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728662AbfKPPnR (ORCPT + 99 others); Sat, 16 Nov 2019 10:43:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:47162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728594AbfKPPnP (ORCPT ); Sat, 16 Nov 2019 10:43:15 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3AF82073B; Sat, 16 Nov 2019 15:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573918995; bh=SeClWtWmu8SPnfl/B3POrVHkxrOYMl8AalQ0wd7UWY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zJDBLU0BAn49GWFihmNuyHuxqtcmC37sIUvRg/xWEh0Glsp2MkTb5kBgxpVxHl7UW 6LP1tCbxKMoxoq+tIhxK41GesFHT2Gooi/FsKnqYxfuMSk4xFejQ3+JXCpXVgwlkdg rLHK4DW8yNhUFI9MNXOrruCDLFJ55MoSnZhkalwo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Yan, Zheng" , Jeff Layton , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 098/237] ceph: fix dentry leak in ceph_readdir_prepopulate Date: Sat, 16 Nov 2019 10:38:53 -0500 Message-Id: <20191116154113.7417-98-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154113.7417-1-sashal@kernel.org> References: <20191116154113.7417-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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