From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:46192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751035AbcBMC4k (ORCPT ); Fri, 12 Feb 2016 21:56:40 -0500 From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 2/3] f2fs crypto: sync with ext4's fname padding Date: Fri, 12 Feb 2016 18:56:34 -0800 Message-Id: <1455332195-76333-2-git-send-email-jaegeuk@kernel.org> In-Reply-To: <1455332195-76333-1-git-send-email-jaegeuk@kernel.org> References: <1455332195-76333-1-git-send-email-jaegeuk@kernel.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: This patch fixes wrong adoption on fname padding. Signed-off-by: Jaegeuk Kim --- fs/f2fs/crypto_fname.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/crypto_fname.c b/fs/f2fs/crypto_fname.c index 905c065..73741fb 100644 --- a/fs/f2fs/crypto_fname.c +++ b/fs/f2fs/crypto_fname.c @@ -267,13 +267,13 @@ int f2fs_fname_crypto_alloc_buffer(struct inode *inode, u32 ilen, struct f2fs_str *crypto_str) { unsigned int olen; - int padding = 16; + int padding = 32; struct f2fs_crypt_info *ci = F2FS_I(inode)->i_crypt_info; if (ci) padding = 4 << (ci->ci_flags & F2FS_POLICY_FLAGS_PAD_MASK); - if (padding < F2FS_CRYPTO_BLOCK_SIZE) - padding = F2FS_CRYPTO_BLOCK_SIZE; + if (ilen < F2FS_CRYPTO_BLOCK_SIZE) + ilen = F2FS_CRYPTO_BLOCK_SIZE; olen = f2fs_fname_crypto_round_up(ilen, padding); crypto_str->len = olen; if (olen < F2FS_FNAME_CRYPTO_DIGEST_SIZE * 2) -- 2.6.3