From patchwork Tue Dec 1 14:32:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: KP Singh X-Patchwork-Id: 1408893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=keD/Xwsi; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Clm9F62Gmz9sWH; Wed, 2 Dec 2020 02:24:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kk7Vj-0007OY-9S; Tue, 01 Dec 2020 15:24:11 +0000 Received: from mail-wr1-f65.google.com ([209.85.221.65]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kk6i8-0002P1-Cd for kernel-team@lists.ubuntu.com; Tue, 01 Dec 2020 14:32:56 +0000 Received: by mail-wr1-f65.google.com with SMTP id 23so2927301wrc.8 for ; Tue, 01 Dec 2020 06:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Gil/YkV/qEojPCDRG+9N2VK29191DcVOXW+Q/DLuqGs=; b=keD/XwsiXDCv9xn5p99349ro0CtJ0ki0IOPMqO5egCJnWShpH/j4C76s5hOzO8XR6A dQ0q2FQHc9/dta08IreLJ/YkmgvOVanKhbg8AEs/DnDg7MGkKTaEiXs9JvJMyO0RUIvY CkRtJXNnVvgf+4pkRVA/V0BzFKuU+UiTA7V9c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Gil/YkV/qEojPCDRG+9N2VK29191DcVOXW+Q/DLuqGs=; b=tksMRL+Jw9zspWPsvT3Rpvoo1DKZdgOrWpZaY2XZRxlVaNIla15WGdQZa+nnGuwF3g PYUKzz1vATcZGCkwGKJCFLD7ee4E1GTtDggioSYcO05C+K94MHXfWNYRj8fQNmYUwwcQ EuEV57ClYma/6FYTlnnZF3IeZNMRhwmAuZ0tzQdc8dEY8fhxGizS5OP9+psx6SaxhcpV VerZ6fpMCfgvyCYIqmUZS6nMuRxIDp/nG6yeuYPQ1bWIMsme/8Qed7Wu3sCh33cP8HKb nHXIQQHwN43mLrCqvXLAP0hgohTUjaCRstZ1Ih5Fn922VzMjAHoffbSWv1M2NGm2ZmaP L0pA== X-Gm-Message-State: AOAM5301DgNxtJabswATIxgd2tke1F+Qa+lU8kQ2Itd1LsqEX4aurvBq bsUteM6KtpIeXKUO++nkxz21jA5edytkd4RL X-Google-Smtp-Source: ABdhPJyAby0DbdJorpaC8wWXGmu1SWOQcDUGBob1RNnZR0jtlMLFncKSDnU3zN2uW7uMaBVcG/Yxnw== X-Received: by 2002:adf:a39e:: with SMTP id l30mr4092007wrb.195.1606833175440; Tue, 01 Dec 2020 06:32:55 -0800 (PST) Received: from kpsingh.c.googlers.com.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id 90sm3601189wrl.60.2020.12.01.06.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 06:32:54 -0800 (PST) From: KP Singh To: kernel-team@lists.ubuntu.com Subject: [PATCH bpf-next 1/2] selftests/bpf: Update ima test helper's losetup commands Date: Tue, 1 Dec 2020 14:32:51 +0000 Message-Id: <20201201143252.2907489-1-kpsingh@chromium.org> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 01 Dec 2020 15:24:10 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrii Nakryiko , Daniel Borkmann , Alexei Starovoitov Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: KP Singh Update the commands to use the bare minimum options so that it works in busybox environments. Fixes: 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash") Reported-by: Andrii Nakryiko Signed-off-by: KP Singh --- tools/testing/selftests/bpf/ima_setup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh index 15490ccc5e55..ed29bde26a12 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,9 +24,10 @@ 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.ext4 "${loop_device:?}" mount "${loop_device}" "${mount_dir}" cp "${TEST_BINARY}" "${mount_dir}" @@ -38,7 +40,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) + for loop_dev in "${loop_devices}"; do losetup -d $loop_dev done