From: Petr Vorel <pvorel@suse.cz> To: ltp@lists.linux.it Cc: Petr Vorel <pvorel@suse.cz>, Lachlan Sneff <t-josne@linux.microsoft.com>, Lakshmi Ramasubramanian <nramas@linux.microsoft.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, linux-integrity@vger.kernel.org Subject: [PATCH v2 2/4] IMA: Refactor datafiles directory Date: Fri, 7 Aug 2020 22:46:50 +0200 [thread overview] Message-ID: <20200807204652.5928-3-pvorel@suse.cz> (raw) In-Reply-To: <20200807204652.5928-1-pvorel@suse.cz> The IMA datafiles directory is structured so that it cannot be directly expanded to include datafiles for tests other than `ima_policy.sh` as it's installed into /opt/ltp/testcases/data/ima_policy. Also not all policies are meant to be for ima_policy.sh, thus move policies into their own directories based on the test which they belong to. Rename policy directory to ima_policy to follow the pattern that directory in sources match the installed directory. Reported-by: Lachlan Sneff <t-josne@linux.microsoft.com> Signed-off-by: Lachlan Sneff <t-josne@linux.microsoft.com> [ pvorel: based on Lachlan's patch, rewritten ] Signed-off-by: Petr Vorel <pvorel@suse.cz> --- I rewritten this patch, but used Lachlan's Signed-off-by and copyright for his changes in datafiles/Makefile. Kind regards, Petr .../kernel/security/integrity/ima/datafiles/Makefile | 10 +++++----- .../integrity/ima/datafiles/ima_kexec/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_kexec}/kexec.policy | 0 .../integrity/ima/datafiles/ima_keys/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_keys}/keycheck.policy | 0 .../integrity/ima/datafiles/ima_policy/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_policy}/measure.policy | 0 .../datafiles/{ => ima_policy}/measure.policy-invalid | 0 8 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_kexec}/kexec.policy (100%) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_keys}/keycheck.policy (100%) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_policy}/measure.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_policy}/measure.policy-invalid (100%) diff --git a/testcases/kernel/security/integrity/ima/datafiles/Makefile b/testcases/kernel/security/integrity/ima/datafiles/Makefile index 369407112..6857ccfee 100644 --- a/testcases/kernel/security/integrity/ima/datafiles/Makefile +++ b/testcases/kernel/security/integrity/ima/datafiles/Makefile @@ -1,6 +1,8 @@ # # testcases/kernel/security/integrity/ima/policy testcases Makefile. # +# Copyright (c) Linux Test Project, 2019-2020 +# Copyright (c) 2020 Microsoft Corporation # Copyright (C) 2009, Cisco Systems Inc. # # This program is free software; you can redistribute it and/or modify @@ -20,12 +22,10 @@ # Ngie Cooper, July 2009 # -top_srcdir ?= ../../../../../.. +top_srcdir ?= ../../../../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_DIR := testcases/data/ima_policy +SUBDIRS := ima_* -INSTALL_TARGETS := measure.policy-invalid *.policy - -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile new file mode 100644 index 000000000..5e0d632a7 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_kexec +INSTALL_TARGETS := *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/kexec.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/kexec.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/kexec.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_kexec/kexec.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile new file mode 100644 index 000000000..452321843 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_keys +INSTALL_TARGETS := *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/keycheck.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/keycheck.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/keycheck.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_keys/keycheck.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile new file mode 100644 index 000000000..953e21556 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_policy +INSTALL_TARGETS := *.policy-invalid *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy-invalid similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid rename to testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy-invalid -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Petr Vorel <pvorel@suse.cz> To: ltp@lists.linux.it Subject: [LTP] [PATCH v2 2/4] IMA: Refactor datafiles directory Date: Fri, 7 Aug 2020 22:46:50 +0200 [thread overview] Message-ID: <20200807204652.5928-3-pvorel@suse.cz> (raw) In-Reply-To: <20200807204652.5928-1-pvorel@suse.cz> The IMA datafiles directory is structured so that it cannot be directly expanded to include datafiles for tests other than `ima_policy.sh` as it's installed into /opt/ltp/testcases/data/ima_policy. Also not all policies are meant to be for ima_policy.sh, thus move policies into their own directories based on the test which they belong to. Rename policy directory to ima_policy to follow the pattern that directory in sources match the installed directory. Reported-by: Lachlan Sneff <t-josne@linux.microsoft.com> Signed-off-by: Lachlan Sneff <t-josne@linux.microsoft.com> [ pvorel: based on Lachlan's patch, rewritten ] Signed-off-by: Petr Vorel <pvorel@suse.cz> --- I rewritten this patch, but used Lachlan's Signed-off-by and copyright for his changes in datafiles/Makefile. Kind regards, Petr .../kernel/security/integrity/ima/datafiles/Makefile | 10 +++++----- .../integrity/ima/datafiles/ima_kexec/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_kexec}/kexec.policy | 0 .../integrity/ima/datafiles/ima_keys/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_keys}/keycheck.policy | 0 .../integrity/ima/datafiles/ima_policy/Makefile | 11 +++++++++++ .../ima/datafiles/{ => ima_policy}/measure.policy | 0 .../datafiles/{ => ima_policy}/measure.policy-invalid | 0 8 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_kexec}/kexec.policy (100%) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_keys}/keycheck.policy (100%) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_policy}/measure.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => ima_policy}/measure.policy-invalid (100%) diff --git a/testcases/kernel/security/integrity/ima/datafiles/Makefile b/testcases/kernel/security/integrity/ima/datafiles/Makefile index 369407112..6857ccfee 100644 --- a/testcases/kernel/security/integrity/ima/datafiles/Makefile +++ b/testcases/kernel/security/integrity/ima/datafiles/Makefile @@ -1,6 +1,8 @@ # # testcases/kernel/security/integrity/ima/policy testcases Makefile. # +# Copyright (c) Linux Test Project, 2019-2020 +# Copyright (c) 2020 Microsoft Corporation # Copyright (C) 2009, Cisco Systems Inc. # # This program is free software; you can redistribute it and/or modify @@ -20,12 +22,10 @@ # Ngie Cooper, July 2009 # -top_srcdir ?= ../../../../../.. +top_srcdir ?= ../../../../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_DIR := testcases/data/ima_policy +SUBDIRS := ima_* -INSTALL_TARGETS := measure.policy-invalid *.policy - -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile new file mode 100644 index 000000000..5e0d632a7 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_kexec +INSTALL_TARGETS := *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/kexec.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_kexec/kexec.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/kexec.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_kexec/kexec.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile new file mode 100644 index 000000000..452321843 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_keys +INSTALL_TARGETS := *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/keycheck.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_keys/keycheck.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/keycheck.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_keys/keycheck.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile new file mode 100644 index 000000000..953e21556 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) Linux Test Project, 2020 + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_policy +INSTALL_TARGETS := *.policy-invalid *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy rename to testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid b/testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy-invalid similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid rename to testcases/kernel/security/integrity/ima/datafiles/ima_policy/measure.policy-invalid -- 2.28.0
next prev parent reply other threads:[~2020-08-07 20:47 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-07 20:46 [PATCH v2 0/4] IMA: verify measurement of certificate imported into a keyring Petr Vorel 2020-08-07 20:46 ` [LTP] " Petr Vorel 2020-08-07 20:46 ` [PATCH v2 1/4] IMA/ima_keys.sh Fix policy content check usage Petr Vorel 2020-08-07 20:46 ` [LTP] " Petr Vorel 2020-08-07 20:46 ` Petr Vorel [this message] 2020-08-07 20:46 ` [LTP] [PATCH v2 2/4] IMA: Refactor datafiles directory Petr Vorel 2020-08-07 20:46 ` [PATCH v2 3/4] IMA: Add a test to verify measurement of certificate imported into a keyring Petr Vorel 2020-08-07 20:46 ` [LTP] " Petr Vorel 2020-08-07 21:12 ` Lakshmi Ramasubramanian 2020-08-07 21:12 ` [LTP] " Lakshmi Ramasubramanian 2020-08-17 3:21 ` Mimi Zohar 2020-08-17 3:21 ` [LTP] " Mimi Zohar 2020-08-17 5:13 ` Lakshmi Ramasubramanian 2020-08-17 5:13 ` [LTP] " Lakshmi Ramasubramanian 2020-08-17 11:09 ` Petr Vorel 2020-08-17 11:09 ` [LTP] " Petr Vorel 2020-08-07 20:46 ` [PATCH v2 4/4] IMA/ima_keys.sh: Enhance policy checks Petr Vorel 2020-08-07 20:46 ` [LTP] " Petr Vorel 2020-08-12 13:35 ` [PATCH v2 0/4] IMA: verify measurement of certificate imported into a keyring Petr Vorel 2020-08-12 13:35 ` [LTP] " Petr Vorel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200807204652.5928-3-pvorel@suse.cz \ --to=pvorel@suse.cz \ --cc=linux-integrity@vger.kernel.org \ --cc=ltp@lists.linux.it \ --cc=nramas@linux.microsoft.com \ --cc=t-josne@linux.microsoft.com \ --cc=zohar@linux.vnet.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.