From patchwork Wed Nov 7 20:56:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 994498 X-Patchwork-Delegate: david.oberhollenzer@sigma-star.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nod.at Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J69qJ//S"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="hNzsqQuo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42qzHf55qsz9sDX for ; Thu, 8 Nov 2018 07:57:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=gm03tpwBGryv56+rWLWFqbD5wm65ipDMo0iWNRHZuGo=; b=J69qJ//S8fL9/3 5bIwtYAOrTKNUUQ2wimHE3UVgldDq0JhFL5NyYaj3OZyFahUaAIsbpzini9HvtEtZF3Ezdk9v64t8 J/HQIgELKU577ULtFBS5ZgqDFk1+4gSIAZlvYuGrtkYOJqycxd2nqtvpYJ2+t1jszYZ2frkwvh/Wp fCPDZ5/KG+udE3kqIEQ+VgI6Au5DNFH4ogumAG5DISoZtM4Wn0m2WWOaug099GrQExTwepzz19zy1 6pdutbxjZGUhnZYBTy8B9C8taYP4B9qB3/k45DSJLVzfnZ2bRNtqmZkeKU+tE3GdiyhyyKm5mMmN4 42oJnIxqvbz2xU4vhXsA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKUsk-0001XP-M4; Wed, 07 Nov 2018 20:56:58 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKUsh-0001U7-Lr for linux-mtd@bombadil.infradead.org; Wed, 07 Nov 2018 20:56:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ikRDMB/VhwL83O84oH/vxdB3GZ/6jV9jiuDlDcKGLww=; b=hNzsqQuoYKqSKrM2hGjeM7F4C+ nkNtnQMFSC5xrJJmHHI/WNhpUkaGvzUkEuHV5ZYF+oo9zgjMAYshOkljjAJ8IHDT6/24BXl2E7BoU pHlRiTje8bcM0fb15wy3gvmkYYTzkkGsqoQmXk0XmynJ+o0frgc8QzgVCEze0w2SwThRq27xBP1ir fcO27oAHt8xhuZc4ikJm1cejB9iDRYi8hha3O9XYNe/Boj5aZCgQRjWKe/I0YK26z8Rj9UPbqDV9V FtjIj8Xnx+O+nR1ICqNpFRi/Qu9nBYxyO0KfeKXLZwIk4aqCq9mtpDXDko89N76oXK/2Tovyv0SfA mmUP/3Uw==; Received: from lilium.sigma-star.at ([109.75.188.150]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKUse-00036c-Nz for linux-mtd@lists.infradead.org; Wed, 07 Nov 2018 20:56:54 +0000 Received: from localhost (localhost [127.0.0.1]) by lilium.sigma-star.at (Postfix) with ESMTP id BEB5818011A7A; Wed, 7 Nov 2018 21:56:41 +0100 (CET) From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH] mkfs.ubifs: Don't compress by default if filesystem is encrypted Date: Wed, 7 Nov 2018 21:56:35 +0100 Message-Id: <20181107205635.16704-1-richard@nod.at> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181107_205652_786246_5A436E82 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , hs@denx.de, david.oberhollenzer@sigma-star.at Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Encryption and compression are not friends. Enable compression in encryption mode only if the user explicitly sets a compressor. Signed-off-by: Richard Weinberger Tested-by: Heiko Schocher --- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 35 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 5847b352038a..666dfe6231a2 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -504,6 +504,20 @@ static int open_ubi(const char *node) return 0; } +static void select_default_compr(void) +{ + if (c->encrypted) { + c->default_compr = UBIFS_COMPR_NONE; + return; + } + +#ifdef WITHOUT_LZO + c->default_compr = UBIFS_COMPR_ZLIB; +#else + c->default_compr = UBIFS_COMPR_LZO; +#endif +} + static int get_options(int argc, char**argv) { int opt, i, fscrypt_flags = FS_POLICY_FLAGS_PAD_4; @@ -519,11 +533,6 @@ static int get_options(int argc, char**argv) c->orph_lebs = 1; c->key_hash = key_r5_hash; c->key_len = UBIFS_SK_LEN; -#ifdef WITHOUT_LZO - c->default_compr = UBIFS_COMPR_ZLIB; -#else - c->default_compr = UBIFS_COMPR_LZO; -#endif c->favor_percent = 20; c->lsave_cnt = 256; c->leb_size = -1; @@ -533,6 +542,7 @@ static int get_options(int argc, char**argv) c->log_lebs = -1; c->double_hash = 0; c->encrypted = 0; + c->default_compr = -1; while (1) { opt = getopt_long(argc, argv, optstring, longopts, &i); @@ -645,12 +655,14 @@ static int get_options(int argc, char**argv) else if (strcmp(optarg, "zlib") == 0) c->default_compr = UBIFS_COMPR_ZLIB; #ifndef WITHOUT_LZO - else if (strcmp(optarg, "favor_lzo") == 0) + else if (strcmp(optarg, "favor_lzo") == 0) { + c->default_compr = UBIFS_COMPR_LZO; c->favor_lzo = 1; - else if (strcmp(optarg, "lzo") != 0) -#else - else + } else if (strcmp(optarg, "lzo") == 0) { + c->default_compr = UBIFS_COMPR_LZO; + } #endif + else return err_msg("bad compressor name"); break; case 'X': @@ -777,6 +789,9 @@ static int get_options(int argc, char**argv) #endif } + if (c->default_compr == -1) + select_default_compr(); + if (c->min_io_size == -1) return err_msg("min. I/O unit was not specified " "(use -h for help)"); @@ -1787,7 +1802,7 @@ static int add_file(const char *path_name, struct stat *st, ino_t inum, key_write(&key, &dn->key); out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ; if (c->default_compr == UBIFS_COMPR_NONE && - (flags & FS_COMPR_FL)) + !c->encrypted && (flags & FS_COMPR_FL)) #ifdef WITHOUT_LZO use_compr = UBIFS_COMPR_ZLIB; #else