From patchwork Wed Jun 19 12:47:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 1118685 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=213.254.12.146; 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="YS1Ygdve"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45TPqD6N72z9sNT for ; Wed, 19 Jun 2019 22:47:20 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id ED86D3EA896 for ; Wed, 19 Jun 2019 14:47:17 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 6D2BB3EA2E2 for ; Wed, 19 Jun 2019 14:47:15 +0200 (CEST) Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id C6325200778 for ; Wed, 19 Jun 2019 14:47:13 +0200 (CEST) Received: by mail-wr1-x441.google.com with SMTP id x4so3247930wrt.6 for ; Wed, 19 Jun 2019 05:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3ilkcr2L43jNRqMhtDoBNSlv7JUT3BSXHz5MxgJHUKM=; b=YS1YgdveLJJgANOl654Lj/1R00iXlITLNAZMv3ycDdyikAeW6uypaJHsQtntfZXrfj wHg0WRgeZAyVs0CZdvw8Bgf3FV/z0vOmnnsguzCvbfQHhDWSasreIHlXbalnp86DusXN GgnGjNZwxxA2N4/5m2GR79+KKZAKE9vRrKfR1CxC3K3mlyZbrq7BTPF1YYrxxdxVQj4x QR+3gtvm0Tefeh1DBTkgEEuxZOKucPoranyMLvE7Fk8IULFRi0tzDBwGQht85fThqUH8 yfxjUrOiVKn573QdH5wkObhwZLf5eWKbhrEZaEfEjDRyHvD4vos29qJZuJCpS7AHBXfx jdWg== 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; bh=3ilkcr2L43jNRqMhtDoBNSlv7JUT3BSXHz5MxgJHUKM=; b=FKiq8lH+myZId1yTJoCWXGw3WzkCpqJ6CNWjt4JVZkczU+ACVtPP13FiMuxDKAHeNw b13DzohYEoLNbHM8jIGAPS01dTrZZvEEstEbmrEfqL7sNZRgYx/IAPgTH+QgPePSPaSL 684OQW5Q4c0sYnL7BryL43jexsKrmy5B93YkOebxc5OzYVZx0haY9GnUsvj2miDWLva+ Uqn7L9aJbb68yahwequ4Cr3SmX1JPpv2MF/qz0GjHry2WUu8lldo4w/o/+Z00BsryXSO Y6ty7WOD4PJuM5yywacuymnrjb4PVSQp0bYhS201Y8WZGUyrIiVm81SGdPuA0Tl4CrHB B9RQ== X-Gm-Message-State: APjAAAVe4LAnUuI/WUYTaZh3Sq2ISFmT7eq4ABlodiiJKd8elLAE7OlB qgVKouDEezUmdSo5I4JTcsx4vo8K X-Google-Smtp-Source: APXvYqz9ymQjFL9AvVbthSZtYbqzUFGC75MsJ9IwnQYsnpjYdBEv+Vhm016Bwp6vVHDSEJ9VxCVyZw== X-Received: by 2002:a5d:5186:: with SMTP id k6mr74757908wrv.30.1560948433197; Wed, 19 Jun 2019 05:47:13 -0700 (PDT) Received: from amir-ThinkPad-T480.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id s7sm5345196wmc.2.2019.06.19.05.47.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2019 05:47:12 -0700 (PDT) From: Amir Goldstein To: Cyril Hrubis Date: Wed, 19 Jun 2019 15:47:07 +0300 Message-Id: <20190619124707.2981-1-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.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_HELO_NONE, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Cc: ltp@lists.linux.it Subject: [LTP] [PATCH] syscalls/getxattr05: skip userns test cases when not supported 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" These test cases are failing when CONFIG_USER_NS is not defined. Signed-off-by: Amir Goldstein --- testcases/kernel/syscalls/getxattr/getxattr05.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testcases/kernel/syscalls/getxattr/getxattr05.c b/testcases/kernel/syscalls/getxattr/getxattr05.c index 31b985ee0..c0d339f29 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr05.c +++ b/testcases/kernel/syscalls/getxattr/getxattr05.c @@ -37,11 +37,13 @@ #if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LIBACL) #define TEST_FILE "testfile" +#define SELF_USERNS "/proc/self/ns/user" #define MAX_USERNS "/proc/sys/user/max_user_namespaces" #define UID_MAP "/proc/self/uid_map" static acl_t acl; static int orig_max_userns = -1; +static int user_ns_supported = 1; static struct tcase { /* 0: without userns, 1: with userns */ @@ -110,6 +112,11 @@ static void do_getxattr(unsigned int n) struct tcase *tc = &tcases[n]; pid_t pid; + if (tc->set_userns && !user_ns_supported) { + tst_res(TCONF, "user namespace not available"); + return; + } + pid = SAFE_FORK(); if (!pid) { if (tc->set_userns) @@ -144,10 +151,13 @@ static void setup(void) /* The default value of max_user_namespaces is set to 0 on some distros, * We need to change the default value to call unshare(). */ - if (!access(MAX_USERNS, F_OK)) { + if (access(SELF_USERNS, F_OK) != 0) { + user_ns_supported = 0; + } else if (!access(MAX_USERNS, F_OK)) { SAFE_FILE_SCANF(MAX_USERNS, "%d", &orig_max_userns); SAFE_FILE_PRINTF(MAX_USERNS, "%d", 10); } + } static void cleanup(void)