From patchwork Sun Apr 3 05:21:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 8732931 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D6BA9F36E for ; Sun, 3 Apr 2016 05:25:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8287D20251 for ; Sun, 3 Apr 2016 05:25:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94FD62022D for ; Sun, 3 Apr 2016 05:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752572AbcDCFXr (ORCPT ); Sun, 3 Apr 2016 01:23:47 -0400 Received: from mail-ig0-f195.google.com ([209.85.213.195]:36593 "EHLO mail-ig0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672AbcDCFXo (ORCPT ); Sun, 3 Apr 2016 01:23:44 -0400 Received: by mail-ig0-f195.google.com with SMTP id sy18so7646765igc.3; Sat, 02 Apr 2016 22:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hom6Wq7XRJ5PETxkwbdLU3dy37x2UsIvglqoUSGFUNQ=; b=j3A87mcscz05Mbezm4OheRNQLUYFQuA6ky40rHyD2CT/cmuBjkcUiidV0YvN+qYNOM CiM/kmEcqvV3pHFFE9Q1lIDM3kIVVFi+Qkxyq9QeWiZb3suXoQO98d2Ydf7YNldz4yLV nW7KNtkDbCBUDmwCKsUZSJsMFFx3Y0lZGnPFeJT+Dcyr6Wh0kc4L4lqstG75U71nHwXs 78u0w882fagxJmogwFMHD8bpPvNhyUpfyxSZCqAhEAHlg2xRBouiflR4m6gealMfPAvC SL4j8GclYrwMBAosqWoybNDiHUpVTAPDPU4H3/tibMpgvaYzsbBs6uCDEcz7tcBbXIAg yK/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hom6Wq7XRJ5PETxkwbdLU3dy37x2UsIvglqoUSGFUNQ=; b=VxdudfrwNWcNFndHhOr0W0qRL4K/vvNA6TN7MjV24zwXtLBrb29i4Pd4lizbgctaZ8 cu4AAfrYVCBoN6zI1Kw384F5sh9BpYO/xHm298iTxfJACLdc9wrcbTol6Y6plxc5XPQl rQFWI/inT4J5264mvWLzRZYz7MIQpwXWhHG1Kpxz+stySGa2X/H/UGff1vUqIvxSGUrK uKOBpw/MU+cPIPQeAqVz36wyfvlIVMUfahAt2cpx1H0hwVI7dR6Jb3mOWmTRT+uYLG0d 7Cx/NcAZeV3ghnuTy2e8vVkex4LDNlUxYz8lwae2rA5LWe98RtvOZN/iEuN0wA2f+Yyz sifQ== X-Gm-Message-State: AD7BkJIA06/862SRgdqXsGVV3Om7XVqISoq9b4reQeYYR2O1eYgQyS2tHzncM6n3A0LXwQ== X-Received: by 10.50.137.66 with SMTP id qg2mr4951901igb.25.1459661023152; Sat, 02 Apr 2016 22:23:43 -0700 (PDT) Received: from localhost.localdomain (c-24-7-245-123.hsd1.mn.comcast.net. [24.7.245.123]) by smtp.gmail.com with ESMTPSA id je6sm2914954igb.15.2016.04.02.22.23.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Apr 2016 22:23:42 -0700 (PDT) From: Eric Biggers To: linux-fsdevel@vger.kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, jaegeuk@kernel.org, tytso@mit.edu, mhalcrow@google.com, Eric Biggers Subject: [PATCH 08/13] fscrypto: use standard macros from kernel.h Date: Sun, 3 Apr 2016 00:21:59 -0500 Message-Id: <1459660924-2960-9-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> References: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Biggers --- fs/crypto/fname.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index cd0eae8..e5c6959 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -14,11 +14,6 @@ #include #include -static u32 size_round_up(size_t size, size_t blksize) -{ - return ((size + blksize - 1) / blksize) * blksize; -} - /** * fname_crypt_complete() - The completion callback for filename encryption and * decryption @@ -61,10 +56,9 @@ static int fname_encrypt(struct inode *inode, if (iname->len <= 0 || iname->len > lim) return -EIO; - ciphertext_len = (iname->len < FS_CRYPTO_BLOCK_SIZE) ? - FS_CRYPTO_BLOCK_SIZE : iname->len; - ciphertext_len = size_round_up(ciphertext_len, padding); - ciphertext_len = (ciphertext_len > lim) ? lim : ciphertext_len; + ciphertext_len = max_t(u32, iname->len, FS_CRYPTO_BLOCK_SIZE); + ciphertext_len = round_up(ciphertext_len, padding); + ciphertext_len = min(ciphertext_len, lim); if (ciphertext_len <= sizeof(buf)) { workbuf = buf; @@ -235,9 +229,8 @@ u32 fscrypt_fname_encrypted_size(struct inode *inode, u32 ilen) if (ci) padding = 4 << (ci->ci_flags & FS_POLICY_FLAGS_PAD_MASK); - if (ilen < FS_CRYPTO_BLOCK_SIZE) - ilen = FS_CRYPTO_BLOCK_SIZE; - return size_round_up(ilen, padding); + ilen = max_t(u32, ilen, FS_CRYPTO_BLOCK_SIZE); + return round_up(ilen, padding); } EXPORT_SYMBOL(fscrypt_fname_encrypted_size);