From patchwork Wed Mar 31 06:27:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangfangpeng X-Patchwork-Id: 413528 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, 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 A3CB7C433DB for ; Wed, 31 Mar 2021 06:28:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5BB91619BB for ; Wed, 31 Mar 2021 06:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233754AbhCaG16 (ORCPT ); Wed, 31 Mar 2021 02:27:58 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:15409 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233694AbhCaG1f (ORCPT ); Wed, 31 Mar 2021 02:27:35 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4F9GXY3y3XzlWkW; Wed, 31 Mar 2021 14:25:49 +0800 (CST) Received: from DESKTOP-JU2N2LB.china.huawei.com (10.67.102.42) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.498.0; Wed, 31 Mar 2021 14:27:23 +0800 From: wangfangpeng To: , , , , CC: , , Subject: [PATCH] ubifs: fix read fail but return ok Date: Wed, 31 Mar 2021 14:27:23 +0800 Message-ID: <20210331062723.2090-1-wangfangpeng1@huawei.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.67.102.42] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org do_readpage() may return err, but ubifs_readpage() always return ok. The vfs will ignore the err happen in ubifs. Fixes: 1e51764a3c2ac05a2 ("UBIFS: add new flash file system") Cc: #v2.6.27 Signed-off-by: wangfangpeng --- fs/ubifs/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 0e4b4be3aa26..001feec1d415 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -892,11 +892,13 @@ static int ubifs_bulk_read(struct page *page) static int ubifs_readpage(struct file *file, struct page *page) { + int ret; + if (ubifs_bulk_read(page)) return 0; - do_readpage(page); + ret = do_readpage(page); unlock_page(page); - return 0; + return ret; } static int do_writepage(struct page *page, int len)