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=-18.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 19D75C07E9B for ; Wed, 7 Jul 2021 11:20:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA05C61C88 for ; Wed, 7 Jul 2021 11:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231404AbhGGLWo (ORCPT ); Wed, 7 Jul 2021 07:22:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29252 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231345AbhGGLWn (ORCPT ); Wed, 7 Jul 2021 07:22:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625656803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4KtAI8w2GPScf+wF2HpEDXs0DTyY2Uj+uMXcwJsLn10=; b=V4PL95n0xdVdO/1FWEELA2RRhoSiZMY06wgvn2B5i3IdS54+Sr/x/n/d+rbsYAkfILP2re XAKj6WFNdRAJhU9wfIMwRxHrS3BLH891+omrilapeBukLS/lkMrtxFiKtiZ+8J/IuYpAPp werPJqsLFDqsKJEXCg5sgzwN/w1sF0s= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-llEJOObzOmeaBnWxrx9EyA-1; Wed, 07 Jul 2021 07:20:01 -0400 X-MC-Unique: llEJOObzOmeaBnWxrx9EyA-1 Received: by mail-pj1-f69.google.com with SMTP id x2-20020a17090ab002b029016e8b858193so1482733pjq.3 for ; Wed, 07 Jul 2021 04:20:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=4KtAI8w2GPScf+wF2HpEDXs0DTyY2Uj+uMXcwJsLn10=; b=Jvj1a2l/mjKRf6CKljFQBgsUOQvkcgjDq1VosWm6Kml1uHcfC5s/i6BxO7S8Y410mY dxOfDppP/3iqF93PTNxpUBNErWv41eeOo1VqQkNPKBX8SHxGylWst8mgRg9B4nYB9bA7 evVF9jJMClyjW0Yi/OZ0z+kkWsRQxsvvkwmvAN583NCrYkljEihaPgXwgBcqI3D+5qR9 PzWom9zAKj0ycGu+wkK2NuLq3C3+WhJnCzmMie/FI9yX5eKO6FauJNvyCRFQGmvd2yj1 HRiHFhB1VGwGv8ld+KgAiGN0fA+wB2ho6M0Bbq0KJb9KLqFkXejm6Hn4LbMI0jjhjepV 2UAw== X-Gm-Message-State: AOAM531d+QDxho31iF40Px6Fw67G6sFej+LS0vhsgOf4lpgm2irCA6SS LT7U+9pKbtagIVlMuvAxaSbHz924lAtYf5C02tTL2BMiaTqFuOEcFG28YsILIljDRQyqbDz8oUD J88vrIdQDWPsLI6CxrHc/o2MTNQ== X-Received: by 2002:a17:90a:cd01:: with SMTP id d1mr5598214pju.106.1625656800824; Wed, 07 Jul 2021 04:20:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+Rxc56o+TvLdCn9mDQnImnYH2E/U+pz583aSQIIdatNKvyI/zqciTHl7ZLnH2gh05OLPndA== X-Received: by 2002:a17:90a:cd01:: with SMTP id d1mr5598189pju.106.1625656800517; Wed, 07 Jul 2021 04:20:00 -0700 (PDT) Received: from [10.72.12.117] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id ay3sm17447940pjb.38.2021.07.07.04.19.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Jul 2021 04:20:00 -0700 (PDT) Subject: Re: [RFC PATCH v7 06/24] ceph: parse new fscrypt_auth and fscrypt_file fields in inode traces To: Luis Henriques , Jeff Layton Cc: ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-fscrypt@vger.kernel.org, dhowells@redhat.com References: <20210625135834.12934-1-jlayton@kernel.org> <20210625135834.12934-7-jlayton@kernel.org> From: Xiubo Li Message-ID: <14d96eb9-c9b5-d854-d87a-65c1ab3be57e@redhat.com> Date: Wed, 7 Jul 2021 19:19:54 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On 7/7/21 6:47 PM, Luis Henriques wrote: > On Fri, Jun 25, 2021 at 09:58:16AM -0400, Jeff Layton wrote: >> ...and store them in the ceph_inode_info. >> >> Signed-off-by: Jeff Layton >> --- >> fs/ceph/file.c | 2 ++ >> fs/ceph/inode.c | 18 ++++++++++++++++++ >> fs/ceph/mds_client.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ >> fs/ceph/mds_client.h | 4 ++++ >> fs/ceph/super.h | 6 ++++++ >> 5 files changed, 74 insertions(+) >> >> diff --git a/fs/ceph/file.c b/fs/ceph/file.c >> index 2cda398ba64d..ea0e85075b7b 100644 >> --- a/fs/ceph/file.c >> +++ b/fs/ceph/file.c >> @@ -592,6 +592,8 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode, >> iinfo.xattr_data = xattr_buf; >> memset(iinfo.xattr_data, 0, iinfo.xattr_len); >> >> + /* FIXME: set fscrypt_auth and fscrypt_file */ >> + >> in.ino = cpu_to_le64(vino.ino); >> in.snapid = cpu_to_le64(CEPH_NOSNAP); >> in.version = cpu_to_le64(1); // ??? >> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c >> index f62785e4dbcb..b620281ea65b 100644 >> --- a/fs/ceph/inode.c >> +++ b/fs/ceph/inode.c >> @@ -611,6 +611,13 @@ struct inode *ceph_alloc_inode(struct super_block *sb) >> >> ci->i_meta_err = 0; >> >> +#ifdef CONFIG_FS_ENCRYPTION >> + ci->fscrypt_auth = NULL; >> + ci->fscrypt_auth_len = 0; >> + ci->fscrypt_file = NULL; >> + ci->fscrypt_file_len = 0; >> +#endif >> + >> return &ci->vfs_inode; >> } >> >> @@ -619,6 +626,9 @@ void ceph_free_inode(struct inode *inode) >> struct ceph_inode_info *ci = ceph_inode(inode); >> >> kfree(ci->i_symlink); >> +#ifdef CONFIG_FS_ENCRYPTION >> + kfree(ci->fscrypt_auth); >> +#endif >> kmem_cache_free(ceph_inode_cachep, ci); >> } >> >> @@ -1021,6 +1031,14 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, >> xattr_blob = NULL; >> } >> >> + if (iinfo->fscrypt_auth_len && !ci->fscrypt_auth) { >> + ci->fscrypt_auth_len = iinfo->fscrypt_auth_len; >> + ci->fscrypt_auth = iinfo->fscrypt_auth; >> + iinfo->fscrypt_auth = NULL; >> + iinfo->fscrypt_auth_len = 0; >> + inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED); >> + } > I think we also need to free iinfo->fscrypt_auth here if ci->fscrypt_auth > is already set. Something like: > > if (iinfo->fscrypt_auth_len) { > if (!ci->fscrypt_auth) { > ... > } else { > kfree(iinfo->fscrypt_auth); > iinfo->fscrypt_auth = NULL; > } > } > IMO, this should be okay because it will be freed in destroy_reply_info() when putting the request. >> + >> /* finally update i_version */ >> if (le64_to_cpu(info->version) > ci->i_version) >> ci->i_version = le64_to_cpu(info->version); >> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c >> index 3b3a14024ca0..9c994effc51d 100644 >> --- a/fs/ceph/mds_client.c >> +++ b/fs/ceph/mds_client.c >> @@ -183,8 +183,48 @@ static int parse_reply_info_in(void **p, void *end, >> info->rsnaps = 0; >> } >> >> + if (struct_v >= 5) { >> + u32 alen; >> + >> + ceph_decode_32_safe(p, end, alen, bad); >> + >> + while (alen--) { >> + u32 len; >> + >> + /* key */ >> + ceph_decode_32_safe(p, end, len, bad); >> + ceph_decode_skip_n(p, end, len, bad); >> + /* value */ >> + ceph_decode_32_safe(p, end, len, bad); >> + ceph_decode_skip_n(p, end, len, bad); >> + } >> + } >> + >> + /* fscrypt flag -- ignore */ >> + if (struct_v >= 6) >> + ceph_decode_skip_8(p, end, bad); >> + >> + if (struct_v >= 7) { >> + ceph_decode_32_safe(p, end, info->fscrypt_auth_len, bad); >> + if (info->fscrypt_auth_len) { >> + info->fscrypt_auth = kmalloc(info->fscrypt_auth_len, GFP_KERNEL); >> + if (!info->fscrypt_auth) >> + return -ENOMEM; >> + ceph_decode_copy_safe(p, end, info->fscrypt_auth, >> + info->fscrypt_auth_len, bad); >> + } >> + ceph_decode_32_safe(p, end, info->fscrypt_file_len, bad); >> + if (info->fscrypt_file_len) { >> + info->fscrypt_file = kmalloc(info->fscrypt_file_len, GFP_KERNEL); >> + if (!info->fscrypt_file) >> + return -ENOMEM; > As Xiubo already pointed out, there's a kfree(info->fscrypt_auth) missing > in this error path. > > Cheers, > -- > Luís > >> + ceph_decode_copy_safe(p, end, info->fscrypt_file, >> + info->fscrypt_file_len, bad); >> + } >> + } >> *p = end; >> } else { >> + /* legacy (unversioned) struct */ >> if (features & CEPH_FEATURE_MDS_INLINE_DATA) { >> ceph_decode_64_safe(p, end, info->inline_version, bad); >> ceph_decode_32_safe(p, end, info->inline_len, bad); >> @@ -625,6 +665,10 @@ static int parse_reply_info(struct ceph_mds_session *s, struct ceph_msg *msg, >> >> static void destroy_reply_info(struct ceph_mds_reply_info_parsed *info) >> { >> + kfree(info->diri.fscrypt_auth); >> + kfree(info->diri.fscrypt_file); >> + kfree(info->targeti.fscrypt_auth); >> + kfree(info->targeti.fscrypt_file); >> if (!info->dir_entries) >> return; >> free_pages((unsigned long)info->dir_entries, get_order(info->dir_buf_size)); >> diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h >> index 64ea9d853b8d..0c3cc61fd038 100644 >> --- a/fs/ceph/mds_client.h >> +++ b/fs/ceph/mds_client.h >> @@ -88,6 +88,10 @@ struct ceph_mds_reply_info_in { >> s32 dir_pin; >> struct ceph_timespec btime; >> struct ceph_timespec snap_btime; >> + u8 *fscrypt_auth; >> + u8 *fscrypt_file; >> + u32 fscrypt_auth_len; >> + u32 fscrypt_file_len; >> u64 rsnaps; >> u64 change_attr; >> }; >> diff --git a/fs/ceph/super.h b/fs/ceph/super.h >> index 0cd94b296f5f..e032737fe472 100644 >> --- a/fs/ceph/super.h >> +++ b/fs/ceph/super.h >> @@ -429,6 +429,12 @@ struct ceph_inode_info { >> >> #ifdef CONFIG_CEPH_FSCACHE >> struct fscache_cookie *fscache; >> +#endif >> +#ifdef CONFIG_FS_ENCRYPTION >> + u32 fscrypt_auth_len; >> + u32 fscrypt_file_len; >> + u8 *fscrypt_auth; >> + u8 *fscrypt_file; >> #endif >> errseq_t i_meta_err; >> >> -- >> 2.31.1 >>