From patchwork Fri Nov 16 06:51:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 998776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dii7ne6L"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42x86K5NKLz9s8F for ; Fri, 16 Nov 2018 17:51:53 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 0CA753E7726 for ; Fri, 16 Nov 2018 07:51:51 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) by picard.linux.it (Postfix) with ESMTP id 62CA93E6576 for ; Fri, 16 Nov 2018 07:51:36 +0100 (CET) Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 886811000DA4 for ; Fri, 16 Nov 2018 07:51:36 +0100 (CET) Received: by mail-wm1-x343.google.com with SMTP id y139so3606507wmc.5 for ; Thu, 15 Nov 2018 22:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=15D5MVM74VXiT/LJcJrLk0TFRunZPBbXaPKdPTSPpbU=; b=Dii7ne6LACrWfZ4vw3u5/NLqT3QMjQy/ifm25Utixa9u9amrP7c2TvdF4dOC6kYIZh VqSwztVcgwYXw70tEfP5m5t9uVnr7ALbSxB+ATRy/FkJ6HHgP8pKDQ8UGBEUAzPWhCd8 VHGgX14yXhJ+YWezR8+XRxfox4JczyyWGbcDe2QCdBa/WlTkNOmXqoTKvNYnAVVnE5xw xt9i9OVX6cPf9mY87wgDscYOa0OkVma5RSgm6Ie3yW6d+rKma7M6tKxp0l4gEXflBEMS iieyPCP2n8S7lFUyqfqK+4+jI/Rmm6rO3S2CCd5pRw15TAqlVLmMmqajKGM1jYeWuKI0 s41A== 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:in-reply-to :references; bh=15D5MVM74VXiT/LJcJrLk0TFRunZPBbXaPKdPTSPpbU=; b=Ot4eqTKGgeTjMFIYFo4Kf386+hymXQU3vuxMc8I/SsvHrTcWzWdRxp12LI6DoW/pVV 8GLP5BPnuoCwi4HaDGXtV5wxcz265gG5nZMnp387Fs8cFNyETb1zrjg+NWjvEiaSrVwt dr7pA2Pbqlu2JHgxzugpV0HsJx3dzyWFw6xZcvoTcq6X9LQuhS13rxpPtIKYmFTeZGW+ 9n8how260cOKkdiKa7jNun59QF/7SJr7OvIx74P1XYdJGgFyFMmLnOb9h8QmAhHVIZnV BMOxehyT+DvXjHgS10RbxgcpmBCz+sybYcYbX2ihZ+FZw3Jn9UDA12wKTWG7DDvc88G3 NNkQ== X-Gm-Message-State: AGRZ1gIcbeSae6Qx9rWwR2aSTrYF/f3IB0CfXrNf3DTbRXFj/K9ZMlOH FT0Es/yh/SiL+4YST3PvKLW7mDbs X-Google-Smtp-Source: AJdET5exnXViCE5v7dKxfG4JHEWaVUsly453TWGq2BeiRJBAsVEAW+Cjg5gDUhWjwk/YBdHePwLU0g== X-Received: by 2002:a1c:5d41:: with SMTP id r62-v6mr7303534wmb.93.1542351096032; Thu, 15 Nov 2018 22:51:36 -0800 (PST) Received: from localhost.localdomain ([37.46.46.74]) by smtp.gmail.com with ESMTPSA id z8sm8200598wrr.52.2018.11.15.22.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 22:51:35 -0800 (PST) From: Amir Goldstein To: Cyril Hrubis Date: Fri, 16 Nov 2018 08:51:18 +0200 Message-Id: <20181116065119.6912-5-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181116065119.6912-1-amir73il@gmail.com> References: <20181116065119.6912-1-amir73il@gmail.com> X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Cc: Jan Kara , ltp@lists.linux.it Subject: [LTP] [PATCH 4/5] syscalls/fanotify03: add test for FAN_MARK_FILESYSTEM permission events X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Amir Goldstein --- .../kernel/syscalls/fanotify/fanotify03.c | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c index 19daf57ef..5c105ed32 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify03.c +++ b/testcases/kernel/syscalls/fanotify/fanotify03.c @@ -46,6 +46,7 @@ static unsigned long long event_set[EVENT_MAX]; static unsigned int event_resp[EVENT_MAX]; static char event_buf[EVENT_BUF_LEN]; +static int support_perm_events; static struct tcase { const char *tname; @@ -59,6 +60,10 @@ static struct tcase { "mount mark permission events", INIT_FANOTIFY_MARK_TYPE(MOUNT), }, + { + "filesystem mark permission events", + INIT_FANOTIFY_MARK_TYPE(FILESYSTEM), + }, }; static void generate_events(void) @@ -134,7 +139,7 @@ static void check_child(void) tst_res(TFAIL, "child %s", tst_strstatus(child_ret)); } -static void setup_mark(unsigned int n) +static int setup_mark(unsigned int n) { struct tcase *tc = &tcases[n]; struct fanotify_mark_type *mark = &tc->mark; @@ -144,7 +149,12 @@ static void setup_mark(unsigned int n) if (fanotify_mark(fd_notify, FAN_MARK_ADD | mark->flag, FAN_ACCESS_PERM | FAN_OPEN_PERM, AT_FDCWD, fname) < 0) { - if (errno == EINVAL) { + if (errno == EINVAL && support_perm_events && + mark->flag == FAN_MARK_FILESYSTEM) { + tst_res(TCONF, + "FAN_MARK_FILESYSTEM not supported in kernel?"); + return -1; + } else if (errno == EINVAL) { tst_brk(TCONF | TERRNO, "CONFIG_FANOTIFY_ACCESS_PERMISSIONS not " "configured in kernel?"); @@ -155,9 +165,16 @@ static void setup_mark(unsigned int n) "AT_FDCWD, %s) failed.", fd_notify, mark->name, fname); } + } else { + /* + * To distigouish between perm event not supported and + * filesystem mark not supported. + */ + support_perm_events = 1; } tst_res(TINFO, "Test #%d: %s", n, tc->tname); + return 0; } static void test_fanotify(unsigned int n) @@ -165,7 +182,9 @@ static void test_fanotify(unsigned int n) int tst_count; int ret, len = 0, i = 0, test_num = 0; - setup_mark(n); + if (setup_mark(n) != 0) + return; + run_child(); tst_count = 0;