From: KP Singh <kpsingh@chromium.org>
To: bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Subject: [PATCH bpf-next v4 4/4] selftests/bpf: Indent ima_setup.sh with tabs.
Date: Thu, 3 Dec 2020 19:14:37 +0000 [thread overview]
Message-ID: <20201203191437.666737-5-kpsingh@chromium.org> (raw)
In-Reply-To: <20201203191437.666737-1-kpsingh@chromium.org>
From: KP Singh <kpsingh@google.com>
The file was formatted with spaces instead of tabs and went unnoticed
as checkpatch.pl did not complain (probably because this is a shell
script). Re-indent it with tabs to be consistent with other scripts.
Signed-off-by: KP Singh <kpsingh@google.com>
---
tools/testing/selftests/bpf/ima_setup.sh | 108 +++++++++++------------
1 file changed, 54 insertions(+), 54 deletions(-)
diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh
index b1ee4bf06996..2bfc646bc230 100755
--- a/tools/testing/selftests/bpf/ima_setup.sh
+++ b/tools/testing/selftests/bpf/ima_setup.sh
@@ -10,90 +10,90 @@ TEST_BINARY="/bin/true"
usage()
{
- echo "Usage: $0 <setup|cleanup|run> <existing_tmp_dir>"
- exit 1
+ echo "Usage: $0 <setup|cleanup|run> <existing_tmp_dir>"
+ exit 1
}
ensure_mount_securityfs()
{
- local securityfs_dir=$(grep "securityfs" /proc/mounts | awk '{print $2}')
+ local securityfs_dir=$(grep "securityfs" /proc/mounts | awk '{print $2}')
- if [ -z "${securityfs_dir}" ]; then
- securityfs_dir=/sys/kernel/security
- mount -t securityfs security "${securityfs_dir}"
- fi
+ if [ -z "${securityfs_dir}" ]; then
+ securityfs_dir=/sys/kernel/security
+ mount -t securityfs security "${securityfs_dir}"
+ fi
- if [ ! -d "${securityfs_dir}" ]; then
- echo "${securityfs_dir}: securityfs is not mounted" && exit 1
- fi
+ if [ ! -d "${securityfs_dir}" ]; then
+ echo "${securityfs_dir}: securityfs is not mounted" && exit 1
+ fi
}
setup()
{
- local tmp_dir="$1"
- local mount_img="${tmp_dir}/test.img"
- local mount_dir="${tmp_dir}/mnt"
- local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
- mkdir -p ${mount_dir}
+ local tmp_dir="$1"
+ local mount_img="${tmp_dir}/test.img"
+ local mount_dir="${tmp_dir}/mnt"
+ local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
+ mkdir -p ${mount_dir}
- dd if=/dev/zero of="${mount_img}" bs=1M count=10
+ dd if=/dev/zero of="${mount_img}" bs=1M count=10
- losetup -f "${mount_img}"
- local loop_device=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
+ losetup -f "${mount_img}"
+ local loop_device=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
- mkfs.ext2 "${loop_device:?}"
- mount "${loop_device}" "${mount_dir}"
+ mkfs.ext2 "${loop_device:?}"
+ mount "${loop_device}" "${mount_dir}"
- cp "${TEST_BINARY}" "${mount_dir}"
- local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
+ cp "${TEST_BINARY}" "${mount_dir}"
+ local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
- ensure_mount_securityfs
- echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
+ ensure_mount_securityfs
+ echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
}
cleanup() {
- local tmp_dir="$1"
- local mount_img="${tmp_dir}/test.img"
- local mount_dir="${tmp_dir}/mnt"
+ local tmp_dir="$1"
+ local mount_img="${tmp_dir}/test.img"
+ local mount_dir="${tmp_dir}/mnt"
- local loop_devices=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
+ local loop_devices=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
- for loop_dev in "${loop_devices}"; do
- losetup -d $loop_dev
- done
+ for loop_dev in "${loop_devices}"; do
+ losetup -d $loop_dev
+ done
- umount ${mount_dir}
- rm -rf ${tmp_dir}
+ umount ${mount_dir}
+ rm -rf ${tmp_dir}
}
run()
{
- local tmp_dir="$1"
- local mount_dir="${tmp_dir}/mnt"
- local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
+ local tmp_dir="$1"
+ local mount_dir="${tmp_dir}/mnt"
+ local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
- exec "${copied_bin_path}"
+ exec "${copied_bin_path}"
}
main()
{
- [[ $# -ne 2 ]] && usage
-
- local action="$1"
- local tmp_dir="$2"
-
- [[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
-
- if [[ "${action}" == "setup" ]]; then
- setup "${tmp_dir}"
- elif [[ "${action}" == "cleanup" ]]; then
- cleanup "${tmp_dir}"
- elif [[ "${action}" == "run" ]]; then
- run "${tmp_dir}"
- else
- echo "Unknown action: ${action}"
- exit 1
- fi
+ [[ $# -ne 2 ]] && usage
+
+ local action="$1"
+ local tmp_dir="$2"
+
+ [[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
+
+ if [[ "${action}" == "setup" ]]; then
+ setup "${tmp_dir}"
+ elif [[ "${action}" == "cleanup" ]]; then
+ cleanup "${tmp_dir}"
+ elif [[ "${action}" == "run" ]]; then
+ run "${tmp_dir}"
+ else
+ echo "Unknown action: ${action}"
+ exit 1
+ fi
}
main "$@"
--
2.29.2.576.ga3fc446d84-goog
next prev parent reply other threads:[~2020-12-03 19:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 19:14 [PATCH bpf-next v4 0/4] Fixes for ima selftest KP Singh
2020-12-03 19:14 ` [PATCH bpf-next v4 1/4] selftests/bpf: Update ima_setup.sh for busybox KP Singh
2020-12-03 19:14 ` [PATCH bpf-next v4 2/4] selftests/bpf: Ensure securityfs mount before writing ima policy KP Singh
2020-12-03 19:14 ` [PATCH bpf-next v4 3/4] selftests/bpf: Add config dependency on BLK_DEV_LOOP KP Singh
2020-12-03 19:14 ` KP Singh [this message]
2020-12-03 19:26 ` [PATCH bpf-next v4 0/4] Fixes for ima selftest Andrii Nakryiko
2020-12-04 0:53 ` KP Singh
2020-12-03 19:30 ` patchwork-bot+netdevbpf
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=20201203191437.666737-5-kpsingh@chromium.org \
--to=kpsingh@chromium.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).