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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 568D5C388F9 for ; Tue, 3 Nov 2020 21:19:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06B262242F for ; Tue, 3 Nov 2020 21:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438383; bh=IIAOtgt89gqbo9vAelAbodztDRMXT2h/qI7NZYHRdWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PmDtqEGMiEpKSc16PazGT22p31FshLMfO1BK1NKDl3FVrns+j/rXMkzbtKFbqQMY4 gkjyedcM1FubJEO+bsgq4cskOJO+UKp+Wwi10SMo+0qMnLs6A9zK9HMnMnqn8cn+Mr UFnkgB8d5b2TProjuQvinCmQV0ayiFzAnxMG+xRA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388367AbgKCVIP (ORCPT ); Tue, 3 Nov 2020 16:08:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:47452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388386AbgKCVIC (ORCPT ); Tue, 3 Nov 2020 16:08:02 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 564EE20757; Tue, 3 Nov 2020 21:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437681; bh=IIAOtgt89gqbo9vAelAbodztDRMXT2h/qI7NZYHRdWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HNwjLo9bzvKSUlLTJOYKWN0NWqQ2rDsZn8rDSVYqGQDU8W0hTIvKwX1GZSzeeG9PK yvp8iLU/Drt1m29YgkHDGt+Lytpx3g3ZtZZwh5CvovUI7Gla1wHeNfr1BEg4lKnJPy NP8FiqEiQgI7rsNWX30dZwV1oazv44jKbaLA4bRY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Matthew Wilcox (Oracle)" , David Howells , Linus Torvalds Subject: [PATCH 4.19 181/191] cachefiles: Handle readpage error correctly Date: Tue, 3 Nov 2020 21:37:53 +0100 Message-Id: <20201103203249.646289926@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Matthew Wilcox (Oracle) commit 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 upstream. If ->readpage returns an error, it has already unlocked the page. Fixes: 5e929b33c393 ("CacheFiles: Handle truncate unlocking the page we're reading") Cc: stable@vger.kernel.org Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: David Howells Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/cachefiles/rdwr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/cachefiles/rdwr.c +++ b/fs/cachefiles/rdwr.c @@ -125,7 +125,7 @@ static int cachefiles_read_reissue(struc _debug("reissue read"); ret = bmapping->a_ops->readpage(NULL, backpage); if (ret < 0) - goto unlock_discard; + goto discard; } /* but the page may have been read before the monitor was installed, so @@ -142,6 +142,7 @@ static int cachefiles_read_reissue(struc unlock_discard: unlock_page(backpage); +discard: spin_lock_irq(&object->work_lock); list_del(&monitor->op_link); spin_unlock_irq(&object->work_lock);