From patchwork Tue May 22 20:38:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Krisman Bertazi X-Patchwork-Id: 10419599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 533A16032C for ; Tue, 22 May 2018 20:38:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 434A828E60 for ; Tue, 22 May 2018 20:38:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36ED228E55; Tue, 22 May 2018 20:38:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD16028E40 for ; Tue, 22 May 2018 20:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723AbeEVUi3 (ORCPT ); Tue, 22 May 2018 16:38:29 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:39412 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbeEVUi3 (ORCPT ); Tue, 22 May 2018 16:38:29 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id C4CE02875C5 From: Gabriel Krisman Bertazi To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, Gabriel Krisman Bertazi Subject: [PATCH NOMERGE 08/13] fscrypt: Introduce charset-based matching functions Date: Tue, 22 May 2018 17:38:13 -0300 Message-Id: <20180522203818.14666-9-krisman@collabora.co.uk> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522203818.14666-1-krisman@collabora.co.uk> References: <20180522203818.14666-1-krisman@collabora.co.uk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Changes since RFC v1: - Send length of both strings to comparison functions. - Change length type to size_t. Signed-off-by: Gabriel Krisman Bertazi --- include/linux/fscrypt.h | 1 + include/linux/fscrypt_notsupp.h | 16 ++++++++++++++++ include/linux/fscrypt_supp.h | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 952ab97af325..96559f7bfc63 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -15,6 +15,7 @@ #define _LINUX_FSCRYPT_H #include +#include #define FS_CRYPTO_BLOCK_SIZE 16 diff --git a/include/linux/fscrypt_notsupp.h b/include/linux/fscrypt_notsupp.h index 44b50c04bae9..f38824aa3250 100644 --- a/include/linux/fscrypt_notsupp.h +++ b/include/linux/fscrypt_notsupp.h @@ -159,6 +159,22 @@ static inline bool fscrypt_match_name(const struct fscrypt_name *fname, return !memcmp(de_name, fname->disk_name.name, fname->disk_name.len); } +static inline bool fscrypt_charset_match_name(struct nls_table *charset, + const struct fscrypt_name *fname, + const u8 *de_name, + u32 de_name_len, bool ignorecase) +{ + if (!ignorecase) { + return !nls_strncmp(charset, (char *) de_name, de_name_len, + fname->disk_name.name, + fname->disk_name.len); + } + + return !nls_strncasecmp(charset, (char *) de_name, + (size_t) de_name_len, fname->disk_name.name, + (size_t) fname->disk_name.len); +} + /* bio.c */ static inline void fscrypt_decrypt_bio_pages(struct fscrypt_ctx *ctx, struct bio *bio) diff --git a/include/linux/fscrypt_supp.h b/include/linux/fscrypt_supp.h index 477a7a6504d2..8c55678ce9ce 100644 --- a/include/linux/fscrypt_supp.h +++ b/include/linux/fscrypt_supp.h @@ -187,6 +187,33 @@ static inline bool fscrypt_match_name(const struct fscrypt_name *fname, return !memcmp(de_name, fname->disk_name.name, fname->disk_name.len); } +static inline bool fscrypt_charset_match_name(struct nls_table *charset, + const struct fscrypt_name *fname, + const u8 *de_name, + u32 de_name_len, bool ignorecase) +{ + if (unlikely(!fname->disk_name.name)) { + const struct fscrypt_digested_name *n = + (const void *)fname->crypto_buf.name; + if (WARN_ON_ONCE(fname->usr_fname->name[0] != '_')) + return false; + if (de_name_len <= FSCRYPT_FNAME_MAX_UNDIGESTED_SIZE) + return false; + return !memcmp(FSCRYPT_FNAME_DIGEST(de_name, de_name_len), + n->digest, FSCRYPT_FNAME_DIGEST_SIZE); + } + + if (!ignorecase) { + return !nls_strncmp(charset, (char *) de_name, de_name_len, + fname->disk_name.name, + fname->disk_name.len); + } + + return !nls_strncasecmp(charset, (char *) de_name, de_name_len, + fname->disk_name.name, + fname->disk_name.len); +} + /* bio.c */ extern void fscrypt_decrypt_bio_pages(struct fscrypt_ctx *, struct bio *); extern void fscrypt_pullback_bio_page(struct page **, bool);