Return-Path: Received: from mx2.suse.de ([195.135.220.15]:37798 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbcCJTSj (ORCPT ); Thu, 10 Mar 2016 14:18:39 -0500 From: Jan Kara To: linux-fsdevel@vger.kernel.org Cc: "Wilcox, Matthew R" , Ross Zwisler , Dan Williams , linux-nvdimm@lists.01.org, NeilBrown , Jan Kara Subject: [PATCH 08/12] dax: Fix bogus fault return value on cow faults Date: Thu, 10 Mar 2016 20:18:51 +0100 Message-Id: <1457637535-21633-9-git-send-email-jack@suse.cz> In-Reply-To: <1457637535-21633-1-git-send-email-jack@suse.cz> References: <1457637535-21633-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: In case of cow fault when there is no page mapped at cow location, we return VM_FAULT_LOCKED despite we don't return any page from the fault. The code in do_cow_fault() carefully handled the case when no page was actually returned so no harm was done but still this is a bug waiting to happen. Signed-off-by: Jan Kara --- fs/dax.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 4aa440f9305b..bf39f16e5390 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -680,7 +680,9 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, if (error) goto unlock_page; vmf->page = page; - return VM_FAULT_LOCKED; + if (page) + return VM_FAULT_LOCKED; + return 0; } /* Check we didn't race with a read fault installing a new page */ -- 2.6.2