Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2468001rwb; Fri, 9 Dec 2022 02:27:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf4U54a05gew/LYTQD8COYm1RK8wONQEXSMrahv2ouap84W+4g86GG1Qr/qnwNCABx3w2kRq X-Received: by 2002:a05:6a20:c916:b0:a4:a73e:d1e2 with SMTP id gx22-20020a056a20c91600b000a4a73ed1e2mr7541429pzb.57.1670581639258; Fri, 09 Dec 2022 02:27:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670581639; cv=none; d=google.com; s=arc-20160816; b=uHil0kpjfW51BR5ThPpLTgEsba5fGXdQvAAn7IWBgN3wrDhFtGwjE+4OjANR1h5Ugy LyBo0O4KrJuYPgDzfsD7++4f6MJTwoWV5x048nRgO/tbX6dIRFao3eKn9VZDb94WW2o8 j6HR/eTWgA+rnyroStPZtSrHnqFk5rKNurnU/kaWOb5OsGRWPlLNOS8NLwfgsZBa6AzD qZh+RJnmYLqbpbJWOr3LQPJoX2w7wAS2UyUpHuk8WTweH4qCBmhqLL9+icwPvAftiAbp wiyjy+gBqLoLHR5lCjChm4sZp7C9lZPa6ehUtJPKLf+Z5DahLfNetGJzomictJ5+obJC ZPcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=abWTlQmCEzsEBCm8fwNRwFGXxXgWEXwzSMu02B7YMbA=; b=ZKn49ycBawit85nqrs9fVR0f+C0ux4xhtyJ2Aeg+Tfpyb7fmIG9kXSB3Ull4/DQBAR EPNcONJEZ984LuNo4olMfGrxwSiMOo8lq7wRtoMfoQudljaUqX9GNpmHlaXiYHlOoGcV 4cJafslPSckAjBIZALMGg2L+q0p1odtkanQBF0cM5WcCLAI/8pA6MzdGAcfDlVHzBbzX 8H0buTeNwPJF8ObPeQJKVmQN5YfG1fyTFGts4Hz8tOL/Lj+vT5JPO1axjbidR4av9lHS REjzzOIW0jrf48z0jSqQQ85G/kZTgFC5b9pph1bmtgHNb9N8dRTwLQYFG+iIFiWuklYo tqVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 6-20020a630206000000b004785d99321bsi1133970pgc.598.2022.12.09.02.27.09; Fri, 09 Dec 2022 02:27:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbiLIKHu (ORCPT + 74 others); Fri, 9 Dec 2022 05:07:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbiLIKHs (ORCPT ); Fri, 9 Dec 2022 05:07:48 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD9CE20BFC for ; Fri, 9 Dec 2022 02:07:45 -0800 (PST) Received: from dggpemm500013.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NT67G3zyRzJpCJ; Fri, 9 Dec 2022 18:04:10 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.175.36) by dggpemm500013.china.huawei.com (7.185.36.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 9 Dec 2022 18:07:43 +0800 From: Chen Zhongjin To: CC: , Subject: [PATCH] fs: sysv: Fix sysv_nblocks() returns wrong value Date: Fri, 9 Dec 2022 18:04:48 +0800 Message-ID: <20221209100448.176857-1-chenzhongjin@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.175.36] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500013.china.huawei.com (7.185.36.172) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sysv_nblocks() returns 'blocks' rather than 'res', which only counting the number of triple-indirect blocks and causing sysv_getattr() gets a wrong result. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Chen Zhongjin --- fs/sysv/itree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index d4ec9bb97de9..3b8567564e7e 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c @@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size) res += blocks; direct = 1; } - return blocks; + return res; } int sysv_getattr(struct user_namespace *mnt_userns, const struct path *path, -- 2.17.1