From patchwork Wed Jul 5 19:00:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 116324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2091605vqx; Wed, 5 Jul 2023 12:32:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5csgWtQL3RPt49oHDJnoZLlRGvVbvKmieLVyXMIoXK4DE97mh95Knop3z41Q/lrjGMGrs8 X-Received: by 2002:a05:6a20:8f0f:b0:122:b613:8b2 with SMTP id b15-20020a056a208f0f00b00122b61308b2mr22181446pzk.0.1688585528695; Wed, 05 Jul 2023 12:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688585528; cv=none; d=google.com; s=arc-20160816; b=SWuusS2vP3mV3V8cWbuxOwn6tyTRGn3yCPVgfTNOtTahz3vAYLMxvsKkZ38MGuzQbe kFdV+MU2K2IIgFUJXf83EwS85IQijRZyvr9KHuCp7PcIYiN5w23GP8oLgXdWMJHtLiXV 3BZ5ekc9Qd9UJZN37T7eyyXvExhK/Nyv3aU30RneEZPTZQX/Pv7RG7GFVu6cCd65mMg4 IwCO7m5tOBR82Cx81IpWIO0ScYpcJQI1N4567VNvZ2gdbiZ9kleyA63ITKpuPQfufF7F ZRpNGa/tdb8v0KWyJoKfJLsRrebEkmHhCFIyq/PH6AvFSWVUWR/CvaikSN35xlawxep1 yeGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0465mhOC1dB+gajZL+EfTSFPL5DgDV6l/MiABeA6r0A=; fh=Kc/Yi9ULky76Bvw8G88y52WdFbmBuUWyAHoq+9u/0QQ=; b=aiC9QxjIVpMTyTYgN75nFJVx+NBz76zFrZkqTyf+r2riv9zCLeqsDrXvrH/TMjWygW CnnOFsdByWTxVYGKyzqzbcTYZBgWMRllLQ3udUfvVt61i+nSiQ0OxQbQt304OGwqnOne L2mysNGJA72xkCjeiUzsCfBpjS5e57c/N25795s0kHsGo3cREtNo3fGNdZO3WHMUvowJ oDQ5s/oxfpes/pwMHpn9uEfs1m9+qbaW0H2tD7F/smTVT8gT+/bzcLcRBmBlqLQe/XAp WucLOCQQ8vPDipZwPmAJbKw9jALeYYj48WRaMj3oJI1Y6BHHuGnqR7IXoEpfmXqMGcY4 aBew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nHRmfAFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j62-20020a638041000000b0055337ca9cefsi24680167pgd.857.2023.07.05.12.31.53; Wed, 05 Jul 2023 12:32:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nHRmfAFC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233488AbjGETDa (ORCPT + 99 others); Wed, 5 Jul 2023 15:03:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233429AbjGETDU (ORCPT ); Wed, 5 Jul 2023 15:03:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 805581989; Wed, 5 Jul 2023 12:03:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0EBAF616EC; Wed, 5 Jul 2023 19:03:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A5B1C433C8; Wed, 5 Jul 2023 19:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688583797; bh=+uSvE3e5ye7FfXdRduYnM950dEjKVs4JL0lbLQl6+aA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nHRmfAFCK2CDsQX39XN80sxMtmLR2cyM9QdVxuZU+mNJtHJNTpkluf86dZUHb3oZm VREay/ivmBMjXnBEdj8RlyVihmjXYqcSE0DACGVRSkme/DOPZ4DVpsRHhFX+65f7/R MCx/3+lO10b8UrW30Wh++8L6I7bMXq3ON8vL+YcHkgSn2M9qEOGbH+t7YIc1H89A7n 41VwFuVjYESB3h80f7qBU6V9upZw+mr7gpbmI/Ofon98PaNR899XsdTdvwtmCu9e9u yAuCc2hZXFo5eG/TQgJ6eIetyxWH0SB8/Rw3nPincepwzoHaHJXc1Se4CiBma6fsuB T/CaTPyej1ctg== From: Jeff Layton To: Christian Brauner , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" Cc: Al Viro , Jan Kara , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org Subject: [PATCH v2 05/92] apparmor: update ctime whenever the mtime changes on an inode Date: Wed, 5 Jul 2023 15:00:32 -0400 Message-ID: <20230705190309.579783-5-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705190309.579783-1-jlayton@kernel.org> References: <20230705185755.579053-1-jlayton@kernel.org> <20230705190309.579783-1-jlayton@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770610259318131219?= X-GMAIL-MSGID: =?utf-8?q?1770610259318131219?= In general, when updating the mtime on an inode, one must also update the ctime. Add the missing ctime updates. Acked-by: John Johansen Signed-off-by: Jeff Layton --- security/apparmor/apparmorfs.c | 7 +++++-- security/apparmor/policy_unpack.c | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 8e634fde35a5..3d0d370d6ffd 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -1554,8 +1554,11 @@ void __aafs_profile_migrate_dents(struct aa_profile *old, for (i = 0; i < AAFS_PROF_SIZEOF; i++) { new->dents[i] = old->dents[i]; - if (new->dents[i]) - new->dents[i]->d_inode->i_mtime = current_time(new->dents[i]->d_inode); + if (new->dents[i]) { + struct inode *inode = d_inode(new->dents[i]); + + inode->i_mtime = inode->i_ctime = current_time(inode); + } old->dents[i] = NULL; } } diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 694fb7a09962..ed180722a833 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -86,10 +86,13 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision) data->revision = revision; if ((data->dents[AAFS_LOADDATA_REVISION])) { - d_inode(data->dents[AAFS_LOADDATA_DIR])->i_mtime = - current_time(d_inode(data->dents[AAFS_LOADDATA_DIR])); - d_inode(data->dents[AAFS_LOADDATA_REVISION])->i_mtime = - current_time(d_inode(data->dents[AAFS_LOADDATA_REVISION])); + struct inode *inode; + + inode = d_inode(data->dents[AAFS_LOADDATA_DIR]); + inode->i_mtime = inode->i_ctime = current_time(inode); + + inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]); + inode->i_mtime = inode->i_ctime = current_time(inode); } }