On Thu, Dec 3, 2020 at 12:13 AM Andrii Nakryiko
<andrii.nakryiko@xxxxxxxxx> wrote:
>
> On Wed, Dec 2, 2020 at 2:39 PM KP Singh <kpsingh@xxxxxxxxxxxx> wrote:
> >
> > From: KP Singh <kpsingh@xxxxxxxxxx>
> >
> > * losetup on busybox does not output the name of loop device on using
> > -f with --show. It also dosn't support -j to find the loop devices
> > for a given backing file. losetup is updated to use "-a" which is
> > available on busybox.
> > * blkid does not support options (-s and -o) to only display the uuid.
> > * Not all environments have mkfs.ext4, the test requires a loop device
> > with a backing image file which could formatted with any filesystem.
> > Update to using mkfs.ext2 which is available on busybox.
> >
> > Fixes: 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash")
> > Reported-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> > Signed-off-by: KP Singh <kpsingh@xxxxxxxxxx>
> > ---
>
> Thanks for the fixes!
>
> You have three related patches, please add a cover letter to the patch
> set as well.
Will do.
>
> > tools/testing/selftests/bpf/ima_setup.sh | 12 ++++++++----
> > 1 file changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh
> > index 15490ccc5e55..d864c62c1207 100755
> > --- a/tools/testing/selftests/bpf/ima_setup.sh
> > +++ b/tools/testing/selftests/bpf/ima_setup.sh
> > @@ -3,6 +3,7 @@
> >
> > set -e
> > set -u
> > +set -o pipefail
> >
> > IMA_POLICY_FILE="/sys/kernel/security/ima/policy"
> > TEST_BINARY="/bin/true"
> > @@ -23,13 +24,15 @@ setup()
> >
> > dd if=/dev/zero of="${mount_img}" bs=1M count=10
> >
> > - local loop_device="$(losetup --find --show ${mount_img})"
> > + losetup -f "${mount_img}"
> > + local loop_device=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
> >
> > - mkfs.ext4 "${loop_device}"
> > + mkfs.ext2 "${loop_device:?}"
> > mount "${loop_device}" "${mount_dir}"
> >
> > cp "${TEST_BINARY}" "${mount_dir}"
> > - local mount_uuid="$(blkid -s UUID -o value ${loop_device})"
> > + local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
>
> tabs/spaces mix up here?
Yeah, it seems like the whole file is formatted with spaces and I
added tabs here. Added a patch
at the end of the series which reindents this. I have not added the
"Fixes" tag since it's not
a fix, do feel free to add it, if you think that's the norm for these
kinds of indentation fixes.
>
> > +
> > echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
> > }
> >
> > @@ -38,7 +41,8 @@ cleanup() {
> > local mount_img="${tmp_dir}/test.img"
> > local mount_dir="${tmp_dir}/mnt"
> >
> > - local loop_devices=$(losetup -j ${mount_img} -O NAME --noheadings)
> > + local loop_devices=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
>
> didn't know about :?, fancy
Thanks :) It has helped me in rm -rf ${dir:?}/${file:?}
>
>
> > +
> > for loop_dev in "${loop_devices}"; do
> > losetup -d $loop_dev
> > done
> > --
> > 2.29.2.576.ga3fc446d84-goog
> >
