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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 DEE88C433ED for ; Wed, 28 Apr 2021 04:04:02 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7D2F8613F9 for ; Wed, 28 Apr 2021 04:04:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D2F8613F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4FVQ411Tgfz301K for ; Wed, 28 Apr 2021 14:04:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=pgCrZCij; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=xiang@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=pgCrZCij; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4FVQ3x4cZRz2yyr for ; Wed, 28 Apr 2021 14:03:57 +1000 (AEST) Received: by mail.kernel.org (Postfix) with ESMTPSA id 3237561078; Wed, 28 Apr 2021 04:03:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619582636; bh=gFU5Tk0yxnY+Xj89d0vLrS7EBLzuL9oMn/vGCQ9lAAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pgCrZCijlYBkxLmmEHtMY9Bul72xO2uJfxFmUYsak0iGr5SsvKbjmsoinkDZKz5+V lTnSKFiIH7TN3D/JE5AbTSOq58DvJ7Zjf6CKmChRT44wGfhHhEjyJhimJmkGhTlFbU PFWyI27SeU2+GK/xfrwdYCIBxdvjFLr/ZwzLmyDywvku+oQB+BrWmu/CiLYz3HshEi ih9oqcd0g74q6t4+gPWp8HyXyorHmRd7Ujq9d70Lom4A0798cjrruEneqLN6Skk5ZQ kK8QZ2/mq81JSX6DSZLqM385YHPFXO3d10d6Vh6iL8DiTKcHlGejZD1stJlvrdNwnA Dow1seNrgvNLA== From: Gao Xiang To: linux-erofs@lists.ozlabs.org, Li Guifu Subject: [PATCH v3 4/5] erofs-utils: zero out garbage trailing data for non-0padding cases Date: Wed, 28 Apr 2021 12:03:44 +0800 Message-Id: <20210428040345.4047-4-xiang@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210428040345.4047-1-xiang@kernel.org> References: <20210428040345.4047-1-xiang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gao Xiang Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" When "-E legacy-compress" is used, lz4 0padding feature would be disabled by default in order to support old kernels (< Linux v5.3). In that case, the current mkfs leaves previous garbage data after valid compressed data if the length becomes shorter. This doesn't matter for kernels >= v5.0 since LZ4_decompress_safe_partial() is used. However, for staging erofs v4.19, it uses an in-house customized lz4 implemention due to LZ4_decompress_safe_partial() doesn't work as expected at that time, yet it doesn't allow trailing random data in practice or decompression failure could happen. I don't think it really matters since "obsoleted_mkfs" works perfectly for such old staging versions (v4.19). Anyway, trailing garbage data sounds unreasonable, so let's zero out it now. Fixes: 66653ef10a7f ("erofs-utils: zero out garbage trailing data for non-0padding cases") Signed-off-by: Gao Xiang --- lib/compress.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/compress.c b/lib/compress.c index b8bb89e7ae9d..deef6a2c8ae3 100644 --- a/lib/compress.c +++ b/lib/compress.c @@ -189,18 +189,22 @@ nocompression: ctx->compressedblks = 1; raw = true; } else { - const unsigned int used = ret & (EROFS_BLKSIZ - 1); - const unsigned int margin = - erofs_sb_has_lz4_0padding() && used ? - EROFS_BLKSIZ - used : 0; + const unsigned int tailused = ret & (EROFS_BLKSIZ - 1); + const unsigned int padding = + erofs_sb_has_lz4_0padding() && tailused ? + EROFS_BLKSIZ - tailused : 0; ctx->compressedblks = DIV_ROUND_UP(ret, EROFS_BLKSIZ); + /* zero out garbage trailing data for non-0padding */ + if (!erofs_sb_has_lz4_0padding()) + memset(dst + ret, 0, + roundup(ret, EROFS_BLKSIZ) - ret); /* write compressed data */ erofs_dbg("Writing %u compressed data to %u of %u blocks", count, ctx->blkaddr, ctx->compressedblks); - ret = blk_write(dst - margin, ctx->blkaddr, + ret = blk_write(dst - padding, ctx->blkaddr, ctx->compressedblks); if (ret) return ret; -- 2.20.1