From nobody Wed Apr 1 09:45:44 2026 Received: from mail-ot1-f66.google.com (mail-ot1-f66.google.com [209.85.210.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2CB83E95A5 for ; Tue, 31 Mar 2026 13:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964644; cv=none; b=uoslKrKwhQg1607PjB4C/Hp68LF8owRDRH11ZBMIPTYIVvMhnHqv/Az4N2r2/kIHRH5gpKPHFdFpJDY8aklXxSOJEOXRDFEdJRxw655XLkcAytPQnWTDntqTFUMPRjuMgQSJomlLxZ9/kbTR5jNKvsCKsQI7Q7yox19atvQeQFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964644; c=relaxed/simple; bh=C/blpW9mkcp1Sm/ES0cZwHxL+COPvcIEw6kZngLfqx4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=crVDi1a/Tzgpgtd6qxdYPxIvO1MMmSOeJtjtWzoh+IsocIlI3D9hSWdN+N2rOkk72GASUE63o8hD5ysMz2VbzDaHrCOFvWyBwKjvUDyn5TxU5BWC+gwB9Yvb9ZVpZONQrqImF6NdJd5v0luypZ0ERUZUPNgnTyzVnubjMNoYBVA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b=JPycP/Sy; arc=none smtp.client-ip=209.85.210.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b="JPycP/Sy" Received: by mail-ot1-f66.google.com with SMTP id 46e09a7af769-7d7d4ebccf7so4833128a34.0 for ; Tue, 31 Mar 2026 06:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20230601.gappssmtp.com; s=20230601; t=1774964639; x=1775569439; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6D8X781T+RNnC32u5GL3wA0wuV/pMcGCJFnR7jmmuRI=; b=JPycP/SygYIkkzodBKPQQ3hovsTx/HakK7cwGVPBNkFZbIdpFbqL6jwIdGIstIemFZ gImPPNZXhjnET2XHeRgelxakXh9SaFQ3AXI3T7y7PQOvqQqOMGep+ILMX38rJn2gSTop MrBw9McHZUrR9Nh+obrQt9Sm2TWPKlEkcxKg/grarKZh2qNNSHrE5EUNa/VsBgrovSUC yXp5Sx0O6nKh0d+jCh+d+QG+du+DScKQOeuGPQNhBAfmju5B8h+jBAGwx9H/33lb8ubn KMHZ+iY0ONINsPDl2oVfSIkbj68olwl37LOCHHNEO1ZcJYFWBkRg0A46/FVi0Vf9GpBk VzQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774964639; x=1775569439; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6D8X781T+RNnC32u5GL3wA0wuV/pMcGCJFnR7jmmuRI=; b=qKJhQNJMEViPySzYb8Nc/tFDWNT0Ichp4dLu3drW/ShVijjqrIyVWWp2BYHLIFlfkN L3cl+xYmelso0OadVf43rkfFlCSZ1nnSdhGhGguEfL7cc5P2jGe3xdx58DEPMr21Lpcx SmI2Tc+DSAz3Hco4OC6sa1GknGA/Graw4tqrAWBeuhVI21tUugaO2fw0NCqj+fLgPq5O IDFtp/ZjbAayj0fVVrchBRGG60Odkawhhhe3gn0H2N1JT+Z2qSFB2t+FN7W71u1iOtBf NaF0y8BibRmpD7cioyfeJM+7umXeCZm99iCJ7d3qHvIwYJhj+ZkSpDp6nI5Pnul4VipD qhYw== X-Forwarded-Encrypted: i=1; AJvYcCXxdOhTSgFESHyWnS+U9RXiBIwpdwLc7cpkft1OJ89SsPQ0+jwWVUKIMqga4r+6/dsL6liAiFPb5kuqQLE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3h/SQlzBHqqNZBV6HtRg6H/XQjlVmIC0/YGhLyFkCRX8vw4dU G75YHRDDcIeB7DZ4lylKOuCiLkIJGu0g2z7aiSJWuvwsnw38JebA38z9tDFi5MDXaOrZP2lZNRs OtjoiAG5cpZks6g== X-Gm-Gg: ATEYQzw8aBGm6vyhxvquM8RHs5Amb+yFa+1BfSuEcHbuzyRBrkEHvBK/Oadi2C5ollJ iulktgNez+UxXpywktNUMl/Epe07gG3Pp8rMWDI+8oDm4f9M3hRFjPKlpZbiTVq+JP7GwmWfPbx /3SE4fy1FansASc+1LLRqBYWwvmpFMzN2yOhsPg/DXQ/xX1S162erjwns8casC0ttWdo0fCWp6P xP17hWhnHeJ6zoplf5W7gujJ7Gmi/9rB6PQoq63ilN+FQ4j4P6+sxeNM8cFBewpoyPE1grro0Jk 1W6aL7nmHbD1lFeYXRQi0DHI9KZSz2h5XcGLUVu+fXXNLFO9EB+sw8Atwbnp089/OrMwuznMI0K eyKov7PfNr5zHB0yrzy3/0+agLyPIQ9YzHvV2GRaClf9zenSW+XbCR4LfkhznVxOLon22WzK1Qe jMBi//K9fHhBAIA48/BE9HziBxs+wSCYPUSaeMwdyGhAA9pCh8o0ac2VAX9E0veJfh5KOgqOZGI rbomY3TnZDgM42LGvR2WcNo X-Received: by 2002:a05:6820:2212:b0:67b:ab68:b5e2 with SMTP id 006d021491bc7-67e1863b1b2mr9465431eaf.18.1774964639205; Tue, 31 Mar 2026 06:43:59 -0700 (PDT) Received: from thesius.dot.cyphar.com (2403-5809-a2fc-2-a90-9fd7-aedd-d405.ip6.aussiebb.net. [2403:5809:a2fc:2:a90:9fd7:aedd:d405]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-41d04d95bcasm7470456fac.17.2026.03.31.06.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 06:43:58 -0700 (PDT) From: Aleksa Sarai Date: Wed, 01 Apr 2026 00:43:31 +1100 Subject: [PATCH 1/3] selftests: openat2: move helpers to header Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260401-openat2-selftests-kunit-v1-1-5819ac6cadf5@amutable.com> References: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> In-Reply-To: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> To: Shuah Khan Cc: Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Aleksa Sarai , Aleksa Sarai X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8040; i=aleksa@amutable.com; h=from:subject:message-id; bh=C/blpW9mkcp1Sm/ES0cZwHxL+COPvcIEw6kZngLfqx4=; b=owGbwMvMwCWmMf3Xpe0vXfIZT6slMWSePj9dVi1TgenQtMdf7J9/j2Pyd1o542XCigOhkW8fF RQs9vFl65jIwiDGxWAppsiyzc8zdNP8xVeSP61kg5nDygQyRFqkgYGBgYGFgS83Ma/USMdIz1Tb UM/QSMdIx4iBi1MApvrWM4a/whvc9i/6qBUjeN+s+0/NqgeOcz5snHyir8D9yePkY5F3zRj+Jxx 99/DEPSebDYZcW/cteq6l/epTZM7x4Ldfu6teB5/hZQMA X-Developer-Key: i=aleksa@amutable.com; a=openpgp; fpr=C9C370B246B09F6DBCFC744C34401015D1D2D386 This is a bit ugly, but in the next patch we will move to using kselftest_harness.h -- which doesn't play well with being included in multiple compilation units due to duplicate function definitions. Not including kselftest_harness.h would let us avoid this patch, but the helpers will need include kselftest_harness.h in order to switch to TH_LOG. Signed-off-by: Aleksa Sarai --- tools/testing/selftests/openat2/Makefile | 2 - tools/testing/selftests/openat2/helpers.c | 109 -------------------------- tools/testing/selftests/openat2/helpers.h | 125 +++++++++++++++++++++++++-= ---- 3 files changed, 107 insertions(+), 129 deletions(-) diff --git a/tools/testing/selftests/openat2/Makefile b/tools/testing/selft= ests/openat2/Makefile index 185dc76ebb5f..3100b4d8d1b2 100644 --- a/tools/testing/selftests/openat2/Makefile +++ b/tools/testing/selftests/openat2/Makefile @@ -14,5 +14,3 @@ endif LOCAL_HDRS +=3D helpers.h =20 include ../lib.mk - -$(TEST_GEN_PROGS): helpers.c diff --git a/tools/testing/selftests/openat2/helpers.c b/tools/testing/self= tests/openat2/helpers.c deleted file mode 100644 index 5074681ffdc9..000000000000 --- a/tools/testing/selftests/openat2/helpers.c +++ /dev/null @@ -1,109 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Author: Aleksa Sarai - * Copyright (C) 2018-2019 SUSE LLC. - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include - -#include "helpers.h" - -bool needs_openat2(const struct open_how *how) -{ - return how->resolve !=3D 0; -} - -int raw_openat2(int dfd, const char *path, void *how, size_t size) -{ - int ret =3D syscall(__NR_openat2, dfd, path, how, size); - return ret >=3D 0 ? ret : -errno; -} - -int sys_openat2(int dfd, const char *path, struct open_how *how) -{ - return raw_openat2(dfd, path, how, sizeof(*how)); -} - -int sys_openat(int dfd, const char *path, struct open_how *how) -{ - int ret =3D openat(dfd, path, how->flags, how->mode); - return ret >=3D 0 ? ret : -errno; -} - -int sys_renameat2(int olddirfd, const char *oldpath, - int newdirfd, const char *newpath, unsigned int flags) -{ - int ret =3D syscall(__NR_renameat2, olddirfd, oldpath, - newdirfd, newpath, flags); - return ret >=3D 0 ? ret : -errno; -} - -int touchat(int dfd, const char *path) -{ - int fd =3D openat(dfd, path, O_CREAT, 0700); - if (fd >=3D 0) - close(fd); - return fd; -} - -char *fdreadlink(int fd) -{ - char *target, *tmp; - - E_asprintf(&tmp, "/proc/self/fd/%d", fd); - - target =3D malloc(PATH_MAX); - if (!target) - ksft_exit_fail_msg("fdreadlink: malloc failed\n"); - memset(target, 0, PATH_MAX); - - E_readlink(tmp, target, PATH_MAX); - free(tmp); - return target; -} - -bool fdequal(int fd, int dfd, const char *path) -{ - char *fdpath, *dfdpath, *other; - bool cmp; - - fdpath =3D fdreadlink(fd); - dfdpath =3D fdreadlink(dfd); - - if (!path) - E_asprintf(&other, "%s", dfdpath); - else if (*path =3D=3D '/') - E_asprintf(&other, "%s", path); - else - E_asprintf(&other, "%s/%s", dfdpath, path); - - cmp =3D !strcmp(fdpath, other); - - free(fdpath); - free(dfdpath); - free(other); - return cmp; -} - -bool openat2_supported =3D false; - -void __attribute__((constructor)) init(void) -{ - struct open_how how =3D {}; - int fd; - - BUILD_BUG_ON(sizeof(struct open_how) !=3D OPEN_HOW_SIZE_VER0); - - /* Check openat2(2) support. */ - fd =3D sys_openat2(AT_FDCWD, ".", &how); - openat2_supported =3D (fd >=3D 0); - - if (fd >=3D 0) - close(fd); -} diff --git a/tools/testing/selftests/openat2/helpers.h b/tools/testing/self= tests/openat2/helpers.h index 510e60602511..975de513af86 100644 --- a/tools/testing/selftests/openat2/helpers.h +++ b/tools/testing/selftests/openat2/helpers.h @@ -2,6 +2,7 @@ /* * Author: Aleksa Sarai * Copyright (C) 2018-2019 SUSE LLC. + * Copyright (C) 2026 Amutable GmbH */ =20 #ifndef __RESOLVEAT_H__ @@ -11,19 +12,14 @@ #include #include #include +#include #include +#include #include "kselftest.h" =20 #define ARRAY_LEN(X) (sizeof (X) / sizeof (*(X))) #define BUILD_BUG_ON(e) ((void)(sizeof(struct { int:(-!!(e)); }))) =20 -#ifndef SYS_openat2 -#ifndef __NR_openat2 -#define __NR_openat2 437 -#endif /* __NR_openat2 */ -#define SYS_openat2 __NR_openat2 -#endif /* SYS_openat2 */ - /* * Arguments for how openat2(2) should open the target path. If @resolve is * zero, then openat2(2) operates very similarly to openat(2). @@ -45,8 +41,6 @@ struct open_how { #define OPEN_HOW_SIZE_VER0 24 /* sizeof first published struct */ #define OPEN_HOW_SIZE_LATEST OPEN_HOW_SIZE_VER0 =20 -bool needs_openat2(const struct open_how *how); - #ifndef RESOLVE_IN_ROOT /* how->resolve flags for openat2(2). */ #define RESOLVE_NO_XDEV 0x01 /* Block mount-point crossings @@ -93,16 +87,111 @@ bool needs_openat2(const struct open_how *how); __FILE__, __LINE__, #expr, ##__VA_ARGS__); \ } while (0) =20 -int raw_openat2(int dfd, const char *path, void *how, size_t size); -int sys_openat2(int dfd, const char *path, struct open_how *how); -int sys_openat(int dfd, const char *path, struct open_how *how); -int sys_renameat2(int olddirfd, const char *oldpath, - int newdirfd, const char *newpath, unsigned int flags); +__maybe_unused +static bool needs_openat2(const struct open_how *how) +{ + return how->resolve !=3D 0; +} + +__maybe_unused +static int raw_openat2(int dfd, const char *path, void *how, size_t size) +{ + int ret =3D syscall(__NR_openat2, dfd, path, how, size); + + return ret >=3D 0 ? ret : -errno; +} + +__maybe_unused +static int sys_openat2(int dfd, const char *path, struct open_how *how) +{ + return raw_openat2(dfd, path, how, sizeof(*how)); +} + +__maybe_unused +static int sys_openat(int dfd, const char *path, struct open_how *how) +{ + int ret =3D openat(dfd, path, how->flags, how->mode); + + return ret >=3D 0 ? ret : -errno; +} + +__maybe_unused +static int sys_renameat2(int olddirfd, const char *oldpath, + int newdirfd, const char *newpath, unsigned int flags) +{ + int ret =3D syscall(__NR_renameat2, olddirfd, oldpath, + newdirfd, newpath, flags); + + return ret >=3D 0 ? ret : -errno; +} + +__maybe_unused +static int touchat(int dfd, const char *path) +{ + int fd =3D openat(dfd, path, O_CREAT, 0700); + + if (fd >=3D 0) + close(fd); + return fd; +} + +__maybe_unused +static char *fdreadlink(int fd) +{ + char *target, *tmp; + + E_asprintf(&tmp, "/proc/self/fd/%d", fd); + + target =3D malloc(PATH_MAX); + if (!target) + ksft_exit_fail_msg("fdreadlink: malloc failed\n"); + memset(target, 0, PATH_MAX); + + E_readlink(tmp, target, PATH_MAX); + free(tmp); + return target; +} + +__maybe_unused +static bool fdequal(int fd, int dfd, const char *path) +{ + char *fdpath, *dfdpath, *other; + bool cmp; + + fdpath =3D fdreadlink(fd); + dfdpath =3D fdreadlink(dfd); + + if (!path) + E_asprintf(&other, "%s", dfdpath); + else if (*path =3D=3D '/') + E_asprintf(&other, "%s", path); + else + E_asprintf(&other, "%s/%s", dfdpath, path); + + cmp =3D !strcmp(fdpath, other); + + free(fdpath); + free(dfdpath); + free(other); + return cmp; +} + +static bool openat2_supported =3D false; + +__attribute__((constructor)) +static void __detect_openat2_supported(void) +{ + struct open_how how =3D {}; + int fd; + + BUILD_BUG_ON(sizeof(struct open_how) !=3D OPEN_HOW_SIZE_VER0); =20 -int touchat(int dfd, const char *path); -char *fdreadlink(int fd); -bool fdequal(int fd, int dfd, const char *path); + /* Check openat2(2) support. */ + fd =3D sys_openat2(AT_FDCWD, ".", &how); + openat2_supported =3D (fd >=3D 0); =20 -extern bool openat2_supported; + if (fd >=3D 0) + close(fd); +} =20 #endif /* __RESOLVEAT_H__ */ --=20 2.53.0 From nobody Wed Apr 1 09:45:44 2026 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3CC63E959F for ; Tue, 31 Mar 2026 13:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964648; cv=none; b=WFP68a2mn3ELDstL49d3bYus6YTofPNdTAw/es5Y8Q/T5oYHiUT+rrInLDdaBwZjHsh+MK4sVkxZh9IJGn2pPs9cBMwZ+u9eS+qT96NL1Ak6ugLQV1kzM+pQV1YUTqUV3f+KE+LkHVtSnzhgZtuE55IR+r8u4uWwRH/NenMKpNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964648; c=relaxed/simple; bh=2K20XJ/gwG1IJLQsa/W5M4bLVpssMeZ6ebI1hXmyhUg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S87wNgBtURVQKMsAQdFJ1PrSRJ0hd2HVjulCcc/3rSCVhI2+E6I/VbokOWFQ6a+Wpr/63K02d8R9O/Mpg/dJ4awYhyZdof1GQiktxrhB+DryqSWqnMj9XGEV7mA5UxZ7k4TD9OGCZGqHUBbj2CRM9n1307U5ApjWx8BuOmm8pZk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b=bPH5FtEf; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b="bPH5FtEf" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-4094b31a037so4072187fac.1 for ; Tue, 31 Mar 2026 06:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20230601.gappssmtp.com; s=20230601; t=1774964643; x=1775569443; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gQ99ZO5QOycXZmDuvJz1p/CKA7WICxsOG1IqStLAtuk=; b=bPH5FtEfxBdStchc5SgtDHg1M3QrgYv5RZVm6nFMr+dc7dwWKsNiw3yLdL/C/tMjJq xf+BkdUcFcTHQQPHdew07/gs+AaJALL+SZsLE+Ody7CUI3Luc8YePLkGZg20/wYL0gsq 8Ed7fXSLDhb1P1sh8BajnR6LYNWEQgCfFpB20VgT4aT1We738S7X8c3Fw+XLDHWSNXVY 24uzgMpXj7p2K4FtJd8vzwwQeBaDB0Son/dIjahjii6ZyDIe86STeUHzOfwsgeiI/oxh ECQEgZ72ACtoOlvm1XGmmB6h2LjMw5lYmgElOShFYKc5BCeI9YiPv3NMWCcmqy0Tc+VC i3JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774964643; x=1775569443; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gQ99ZO5QOycXZmDuvJz1p/CKA7WICxsOG1IqStLAtuk=; b=kK6vUPD0sP0qzs9J6ce0qwURrsqOvgqbl1/DDIBAdWMg7fng8yP/3hyeuYB1w7Lh9H 1SHmM/Rg5fyufGFHXQkTiXunAkxKuioLMEc0GmLNpU+MnitTJ6lNqDQ3haO0h54wzf6k 69k0+kHy8ICTapzjqUeY6fE8VYF05zRfBl9jSDbrjyEUG3NwUoMiPwiu4s7n51Wt5GLf VkocWkJ4UUk0hTyJZsYrS11ZJinCPuzZvPIm8eqeS735eXCZxMHLDpmwZtduoXiSPDpk mzdXTZ85C3gGfGlYpUjejfx9yk4A6t5LopPmpqMIwK7wKjKFZEYOLy9PvYyxE9NTXgfw n01w== X-Forwarded-Encrypted: i=1; AJvYcCVWQ3k+AsviFaTP680lqIlbJSIKlmVcmLF5EGO6dob+y4LhYHwq3RZJBhG4M8cSduvPMY1iBbL7mEkzJXQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzqd0+9NoxReEPlUHu/ZjioNufAl6U+iYPSH+4tWExhpYWckHJa DmlaPnwO1Wp/c0hc4maCc9R7q6AU+v3G1pNrjLW711Uerz2p1cTSkmsDZnOdj2hxX0MoqzB3vjr EhErp3g== X-Gm-Gg: ATEYQzzYFzXSiHBVULzmswgJGGo0WNiB+J3CMr0Jmq2ViFfyKzAo35PIvyI03y6lpUN yWwKn62XPKEfbng2pErjdLOJHhzKB1Sf2CMyRe2s46btHcePWqrV7k+KqYuTdC+fxd20dud+tOW wE81TNRvgJJzCREaYzj7VwRoYU6jAHmRt3/Z7ZTOUc/SR44mE0Pgt5+0Nmp0llcCoI3Wh1cm330 awTnrpnpEK6kh/eJv1qhCwHE8CTVTiW0O0k9xOGIcn6mwqUySM0I4n2Gifmm22/ekcLAUWZEhTV HzgN2tq4VF9uz4/DpJS7+Pm4CNzVXINusSjvnKGs1cpoLxIrxhzQ9WmBmA9G1hLfML2t1H2FUyl eQdQc7FpDJtwKMaBx4EMuuWa4AU4ZFu7Qq90bjiwAvI7T23BIPplwfB1t1L+a5KXXFzl8FHooRN pjr3Qx/gBQwnkEaCYPD37YREIh8m9DdEvn9hI10Yz8I8qLU7D2yipXoIxv8wSK8TqwsRgIspZZ2 SCVHXKQYQ2wLLtctyvjqzI8 X-Received: by 2002:a05:6870:a552:b0:409:6227:d313 with SMTP id 586e51a60fabf-41cec31a53amr8250852fac.35.1774964643278; Tue, 31 Mar 2026 06:44:03 -0700 (PDT) Received: from thesius.dot.cyphar.com (2403-5809-a2fc-2-a90-9fd7-aedd-d405.ip6.aussiebb.net. [2403:5809:a2fc:2:a90:9fd7:aedd:d405]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-41d04d95bcasm7470456fac.17.2026.03.31.06.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 06:44:02 -0700 (PDT) From: Aleksa Sarai Date: Wed, 01 Apr 2026 00:43:32 +1100 Subject: [PATCH 2/3] selftests: openat2: switch from custom ARRAY_LEN to ARRAY_SIZE Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260401-openat2-selftests-kunit-v1-2-5819ac6cadf5@amutable.com> References: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> In-Reply-To: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> To: Shuah Khan Cc: Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Aleksa Sarai , Aleksa Sarai X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2991; i=aleksa@amutable.com; h=from:subject:message-id; bh=2K20XJ/gwG1IJLQsa/W5M4bLVpssMeZ6ebI1hXmyhUg=; b=owGbwMvMwCWmMf3Xpe0vXfIZT6slMWSePj/9pJz3xo8KtwRPHP3m562hZjbxueKp8tCTqwu+q C95VuMzq2MiC4MYF4OlmCLLNj/P0E3zF19J/rSSDWYOKxPIEGmRBgYGBgYWBr7cxLxSIx0jPVNt Qz1DIx0jHSMGLk4BmOqPuxgZvkT9lO+9tiVabPK0qKIqk0wZF7V/jrmuXKc3yn1qKJe8xMhwrJ7 Z0OkSD8vD8kOH/0lItEZo/k4ziWt25Tvo/uLImWd8AA== X-Developer-Key: i=aleksa@amutable.com; a=openpgp; fpr=C9C370B246B09F6DBCFC744C34401015D1D2D386 For whatever reason, the original version of the tests used a custom version of ARRAY_SIZE, but ARRAY_SIZE works just as well. Signed-off-by: Aleksa Sarai --- tools/testing/selftests/openat2/helpers.h | 1 - tools/testing/selftests/openat2/openat2_test.c | 12 ++++++------ tools/testing/selftests/openat2/resolve_test.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/openat2/helpers.h b/tools/testing/self= tests/openat2/helpers.h index 975de513af86..f56c0c6e3ad1 100644 --- a/tools/testing/selftests/openat2/helpers.h +++ b/tools/testing/selftests/openat2/helpers.h @@ -17,7 +17,6 @@ #include #include "kselftest.h" =20 -#define ARRAY_LEN(X) (sizeof (X) / sizeof (*(X))) #define BUILD_BUG_ON(e) ((void)(sizeof(struct { int:(-!!(e)); }))) =20 /* diff --git a/tools/testing/selftests/openat2/openat2_test.c b/tools/testing= /selftests/openat2/openat2_test.c index 0e161ef9e9e4..c6c26652ac1b 100644 --- a/tools/testing/selftests/openat2/openat2_test.c +++ b/tools/testing/selftests/openat2/openat2_test.c @@ -83,14 +83,14 @@ void test_openat2_struct(void) .size =3D sizeof(struct open_how_ext), .err =3D -E2BIG }, }; =20 - BUILD_BUG_ON(ARRAY_LEN(misalignments) !=3D NUM_OPENAT2_STRUCT_VARIATIONS); - BUILD_BUG_ON(ARRAY_LEN(tests) !=3D NUM_OPENAT2_STRUCT_TESTS); + BUILD_BUG_ON(ARRAY_SIZE(misalignments) !=3D NUM_OPENAT2_STRUCT_VARIATIONS= ); + BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_STRUCT_TESTS); =20 - for (int i =3D 0; i < ARRAY_LEN(tests); i++) { + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { struct struct_test *test =3D &tests[i]; struct open_how_ext how_ext =3D test->arg; =20 - for (int j =3D 0; j < ARRAY_LEN(misalignments); j++) { + for (int j =3D 0; j < ARRAY_SIZE(misalignments); j++) { int fd, misalign =3D misalignments[j]; char *fdpath =3D NULL; bool failed; @@ -241,9 +241,9 @@ void test_openat2_flags(void) .how.resolve =3D 0, .err =3D -EINVAL }, }; =20 - BUILD_BUG_ON(ARRAY_LEN(tests) !=3D NUM_OPENAT2_FLAG_TESTS); + BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_FLAG_TESTS); =20 - for (int i =3D 0; i < ARRAY_LEN(tests); i++) { + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { int fd, fdflags =3D -1; char *path, *fdpath =3D NULL; bool failed =3D false; diff --git a/tools/testing/selftests/openat2/resolve_test.c b/tools/testing= /selftests/openat2/resolve_test.c index a76ef15ceb90..f7acb4300641 100644 --- a/tools/testing/selftests/openat2/resolve_test.c +++ b/tools/testing/selftests/openat2/resolve_test.c @@ -436,9 +436,9 @@ void test_openat2_opath_tests(void) .out.err =3D -ELOOP, .pass =3D false }, }; =20 - BUILD_BUG_ON(ARRAY_LEN(tests) !=3D NUM_OPENAT2_OPATH_TESTS); + BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_OPATH_TESTS); =20 - for (int i =3D 0; i < ARRAY_LEN(tests); i++) { + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { int dfd, fd; char *fdpath =3D NULL; bool failed; --=20 2.53.0 From nobody Wed Apr 1 09:45:44 2026 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 114813EDAB8 for ; Tue, 31 Mar 2026 13:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964658; cv=none; b=GbLLPgwWy+eSL9+eRMUxIQ5XdFO43aaN3PsVsTRWxtROiPvhpCSEjZCDmxUNQhDAofIf07USuirOYWoTVLlLNX6xLD0zjJtRRrBD9QvS3EFPU4jS1vUeLiGPw3jaoW6OI0GHbHf7dnPdZgSpaLOnDkcMCChBDhxx/H0h8VJb6ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774964658; c=relaxed/simple; bh=CsfNhvq9iQUOY39Rf/H9E9ourg0Q3+Kn+GjgHyOLoVo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P0/wZ76P6LAojHLeYlUl4SWgS2e+/3N0i75jNum6AwzMTsSNy/JHRGVqL27p+MPctWeRJFs3oN6VHmRIeYPGtBgwNvLRLzbA0CLoV/WpBQmiDxPvHMETAO6vrCDs+Y+CZ7vsRrqlE01tgiIMJE7h072iOS299HR1JK7c+edPy7Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b=GgV/xFU3; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20230601.gappssmtp.com header.i=@amutable-com.20230601.gappssmtp.com header.b="GgV/xFU3" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-41c5a81d4b1so4434752fac.1 for ; Tue, 31 Mar 2026 06:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20230601.gappssmtp.com; s=20230601; t=1774964649; x=1775569449; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=E6Ps+0kKQqKZuuy2teEmtG32Rt1+FQXMRykORYM0/0M=; b=GgV/xFU344TRumPwdfPaCSAXjA7uUnvblo3ZZZEFiwEJAkiLlMrGjiCAXmZUrBrpNl sJm5PDBd7Hvg0HrGoYW9HcGAc4ysazzHuuJ7gTnF7lsfySv0z8AqjvhR7kYfqPH4WFJd cMhbdiJpwewOZ1EoPuw6O0OiruLPSwcsVKgYfVP9/Odugw0z3ZrdjN7A2hm9Oe22iLPr NiKp7tH72kux1DoHw5YHwgaJAtc+spVoZ7u6iZ9KoYEvELCULPTEq1IN+xDihZaCEgWQ u5dVH8OmtzszmHH9kuD9a5nXcIFLBWy08A1COFO8b+dqPxAxRatDvXHbK1u9FMt3bL0/ gSEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774964649; x=1775569449; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=E6Ps+0kKQqKZuuy2teEmtG32Rt1+FQXMRykORYM0/0M=; b=BgcLA1Cgujx9GGpmqBQWPNryfTyhXWsL9lqNepyUg0WCw7zUgbze9zYEDiNNxbqF+O vZQlClhfYikXoFlT8txnCsT1JSkg/BN1kWMlreFkl4TP9q8UB4vs4q/cTO6bMKgKMlt/ sgJ38q9q3Owm+4oHmSjTEh8vkMsqi1HMxblWVpOWlshutzO1iybHTEaY5xUrBLYLlC3E uqNnh4mtPUuhpAVi0mU1i2fNE/vlSC53FHjY7Z5HS8V4+ua3gL9EMDnn9g0g+JcaxaEN G+bCaFKRmv3ti2P11qw0nhqfZRsw7Wo6E0vJk/fgQ9R0n8UoM4M7DoEKKDYGSItLQqKb lp6w== X-Forwarded-Encrypted: i=1; AJvYcCVaIh4xvFv2/nNvYIxdkgNcVDisgWfzjELizHHEvZORF7tbtK7VVlt403mWW1Ga4/4P0oyHsByw7XBveyU=@vger.kernel.org X-Gm-Message-State: AOJu0YxAd7dbmnrTRW9xqdBtO8vnpHrlzAeVvDXgIkZaz34m/Ec0MOD4 dIv4dJOpcjN+kqjdbktuedQL+K4UuCnPzBVC8d7I8yaesliQZdYSWcRceS29LZ2hiNgZJ3n4v6j gIgmrSQ== X-Gm-Gg: ATEYQzxxmOb7xGkn0Hfg2UQRH48Uz+f/NB5SzL0bdtC7zp8ro3RXOmeOhHPJKmn3NpM LW0UWI1boAggCGIy9ZTA6e6Qk2QCf8JMoMpSTSDUZbgzhduMAc5XLOQSEIBTOhlZgA11O3IbBHQ h1mGATsf0JBhvuT0YTkYWcJi5w0T/ji8cpxNXhZPHo6EgJp+dBdk4Js3OfQplkAjOCKaenF9nZT V9pBKM223Cq1F3ZPS829SeKrwYHCcaM+4StHGhsLaH0H5a1TeHlbcbT0ihpQD4QgONaQ1hLJwvF bAvaif/gFSqIOO4O0nGSZ4xNUEj6+laq3piqv0B1gh0iO4V3iFpMArhytWO+wUKLVc1/GrC2IUA IXAjjAMGuA1zIFizPlkX81CH7xurdnrNcOTxe/3gDTYdBKXRrcvSGwfT5ng9zpzNU1Bv1kNhoyG UwdMBuIVJXxxbnhAiuQPEt8BhVMyG1FstCaAiJTrs69M4yXxKjzXo2Uc/wZxZUEhWUAC14pGykJ CUjLIC2gtdFXmW4Wk/pqfWo X-Received: by 2002:a05:6870:2246:b0:41c:56c5:7ca2 with SMTP id 586e51a60fabf-422a2258372mr2054680fac.0.1774964649088; Tue, 31 Mar 2026 06:44:09 -0700 (PDT) Received: from thesius.dot.cyphar.com (2403-5809-a2fc-2-a90-9fd7-aedd-d405.ip6.aussiebb.net. [2403:5809:a2fc:2:a90:9fd7:aedd:d405]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-41d04d95bcasm7470456fac.17.2026.03.31.06.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 06:44:08 -0700 (PDT) From: Aleksa Sarai Date: Wed, 01 Apr 2026 00:43:33 +1100 Subject: [PATCH 3/3] selftests: openat2: migrate to kselftest harness Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260401-openat2-selftests-kunit-v1-3-5819ac6cadf5@amutable.com> References: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> In-Reply-To: <20260401-openat2-selftests-kunit-v1-0-5819ac6cadf5@amutable.com> To: Shuah Khan Cc: Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Aleksa Sarai , Aleksa Sarai X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=33391; i=aleksa@amutable.com; h=from:subject:message-id; bh=CsfNhvq9iQUOY39Rf/H9E9ourg0Q3+Kn+GjgHyOLoVo=; b=owGbwMvMwCWmMf3Xpe0vXfIZT6slMWSePj89pWbSRsXza0L3HP3nfOT5/Q8qLBfb9rAwmIncu agwb7vn+46JLAxiXAyWYoos2/w8QzfNX3wl+dNKNpg5rEwgQ6RFGhgYGBhYGPhyE/NKjXSM9Ey1 DfUMjXSMdIwYuDgFYKp9axgZrl09rjcp9Ip0wjO3x7fvb5Gbs2r13bczxB88asnq3ztrqycjwzS Jvvgt046mO/a+1Xp+0WqxyaH1yccVQwVP6k+TuyGexAkA X-Developer-Key: i=aleksa@amutable.com; a=openpgp; fpr=C9C370B246B09F6DBCFC744C34401015D1D2D386 These tests were written in the early days of selftests' TAP support, the more modern kselftest harness is much easier to follow and maintain. The actual contents of the tests are unchanged by this change. Most of the diff involves switching from the E_* syscall wrappers we previously used to ASSERT_EQ(fn(...), 0) in tests and helper functions. The first pass of the migration was done using Claude, followed by a manual rework and review. Assisted-by: Claude:claude-4.6-opus Signed-off-by: Aleksa Sarai --- tools/testing/selftests/openat2/helpers.h | 62 +--- tools/testing/selftests/openat2/openat2_test.c | 217 ++++++------ .../testing/selftests/openat2/rename_attack_test.c | 161 +++++---- tools/testing/selftests/openat2/resolve_test.c | 368 ++++++++++++-----= ---- 4 files changed, 396 insertions(+), 412 deletions(-) diff --git a/tools/testing/selftests/openat2/helpers.h b/tools/testing/self= tests/openat2/helpers.h index f56c0c6e3ad1..7ca54c718c45 100644 --- a/tools/testing/selftests/openat2/helpers.h +++ b/tools/testing/selftests/openat2/helpers.h @@ -15,7 +15,7 @@ #include #include #include -#include "kselftest.h" +#include "kselftest_harness.h" =20 #define BUILD_BUG_ON(e) ((void)(sizeof(struct { int:(-!!(e)); }))) =20 @@ -56,36 +56,6 @@ struct open_how { (similar to chroot(2)). */ #endif /* RESOLVE_IN_ROOT */ =20 -#define E_func(func, ...) \ - do { \ - errno =3D 0; \ - if (func(__VA_ARGS__) < 0) \ - ksft_exit_fail_msg("%s:%d %s failed - errno:%d\n", \ - __FILE__, __LINE__, #func, errno); \ - } while (0) - -#define E_asprintf(...) E_func(asprintf, __VA_ARGS__) -#define E_chmod(...) E_func(chmod, __VA_ARGS__) -#define E_dup2(...) E_func(dup2, __VA_ARGS__) -#define E_fchdir(...) E_func(fchdir, __VA_ARGS__) -#define E_fstatat(...) E_func(fstatat, __VA_ARGS__) -#define E_kill(...) E_func(kill, __VA_ARGS__) -#define E_mkdirat(...) E_func(mkdirat, __VA_ARGS__) -#define E_mount(...) E_func(mount, __VA_ARGS__) -#define E_prctl(...) E_func(prctl, __VA_ARGS__) -#define E_readlink(...) E_func(readlink, __VA_ARGS__) -#define E_setresuid(...) E_func(setresuid, __VA_ARGS__) -#define E_symlinkat(...) E_func(symlinkat, __VA_ARGS__) -#define E_touchat(...) E_func(touchat, __VA_ARGS__) -#define E_unshare(...) E_func(unshare, __VA_ARGS__) - -#define E_assert(expr, msg, ...) \ - do { \ - if (!(expr)) \ - ksft_exit_fail_msg("ASSERT(%s:%d) failed (%s): " msg "\n", \ - __FILE__, __LINE__, #expr, ##__VA_ARGS__); \ - } while (0) - __maybe_unused static bool needs_openat2(const struct open_how *how) { @@ -135,37 +105,39 @@ static int touchat(int dfd, const char *path) } =20 __maybe_unused -static char *fdreadlink(int fd) +static char *fdreadlink(struct __test_metadata *_metadata, int fd) { char *target, *tmp; =20 - E_asprintf(&tmp, "/proc/self/fd/%d", fd); + ASSERT_GT(asprintf(&tmp, "/proc/self/fd/%d", fd), 0); =20 target =3D malloc(PATH_MAX); - if (!target) - ksft_exit_fail_msg("fdreadlink: malloc failed\n"); + ASSERT_NE(target, NULL); memset(target, 0, PATH_MAX); =20 - E_readlink(tmp, target, PATH_MAX); + ASSERT_GT(readlink(tmp, target, PATH_MAX), 0); + free(tmp); return target; } =20 __maybe_unused -static bool fdequal(int fd, int dfd, const char *path) +static bool fdequal(struct __test_metadata *_metadata, int fd, + int dfd, const char *path) { char *fdpath, *dfdpath, *other; bool cmp; =20 - fdpath =3D fdreadlink(fd); - dfdpath =3D fdreadlink(dfd); + fdpath =3D fdreadlink(_metadata, fd); + dfdpath =3D fdreadlink(_metadata, dfd); =20 - if (!path) - E_asprintf(&other, "%s", dfdpath); - else if (*path =3D=3D '/') - E_asprintf(&other, "%s", path); - else - E_asprintf(&other, "%s/%s", dfdpath, path); + if (!path) { + ASSERT_GT(asprintf(&other, "%s", dfdpath), 0); + } else if (*path =3D=3D '/') { + ASSERT_GT(asprintf(&other, "%s", path), 0); + } else { + ASSERT_GT(asprintf(&other, "%s/%s", dfdpath, path), 0); + } =20 cmp =3D !strcmp(fdpath, other); =20 diff --git a/tools/testing/selftests/openat2/openat2_test.c b/tools/testing= /selftests/openat2/openat2_test.c index c6c26652ac1b..5ea3eebb7b59 100644 --- a/tools/testing/selftests/openat2/openat2_test.c +++ b/tools/testing/selftests/openat2/openat2_test.c @@ -15,8 +15,8 @@ #include #include =20 -#include "kselftest.h" #include "helpers.h" +#include "kselftest_harness.h" =20 /* * O_LARGEFILE is set to 0 by glibc. @@ -45,13 +45,29 @@ struct struct_test { int err; }; =20 -#define NUM_OPENAT2_STRUCT_TESTS 7 -#define NUM_OPENAT2_STRUCT_VARIATIONS 13 +struct flag_test { + const char *name; + struct open_how how; + int err; +}; + +FIXTURE(openat2) {}; =20 -void test_openat2_struct(void) +FIXTURE_SETUP(openat2) { - int misalignments[] =3D { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 17, 87 }; + if (!openat2_supported) + SKIP(return, "openat2(2) not supported"); +} + +FIXTURE_TEARDOWN(openat2) {} =20 +/* + * Verify that the struct size and misalignment handling for openat2(2) is + * correct, including that is_zeroed_user() works. + */ +TEST_F(openat2, struct_argument_sizes) +{ + int misalignments[] =3D { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 17, 87 }; struct struct_test tests[] =3D { /* Normal struct. */ { .name =3D "normal struct", @@ -83,26 +99,14 @@ void test_openat2_struct(void) .size =3D sizeof(struct open_how_ext), .err =3D -E2BIG }, }; =20 - BUILD_BUG_ON(ARRAY_SIZE(misalignments) !=3D NUM_OPENAT2_STRUCT_VARIATIONS= ); - BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_STRUCT_TESTS); - for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { struct struct_test *test =3D &tests[i]; struct open_how_ext how_ext =3D test->arg; =20 for (int j =3D 0; j < ARRAY_SIZE(misalignments); j++) { int fd, misalign =3D misalignments[j]; - char *fdpath =3D NULL; - bool failed; - void (*resultfn)(const char *msg, ...) =3D ksft_test_result_pass; - void *copy =3D NULL, *how_copy =3D &how_ext; - - if (!openat2_supported) { - ksft_print_msg("openat2(2) unsupported\n"); - resultfn =3D ksft_test_result_skip; - goto skip; - } + char *fdpath =3D NULL; =20 if (misalign) { /* @@ -119,50 +123,42 @@ void test_openat2_struct(void) } =20 fd =3D raw_openat2(AT_FDCWD, ".", how_copy, test->size); - if (test->err >=3D 0) - failed =3D (fd < 0); - else - failed =3D (fd !=3D test->err); if (fd >=3D 0) { - fdpath =3D fdreadlink(fd); + fdpath =3D fdreadlink(_metadata, fd); close(fd); } =20 - if (failed) { - resultfn =3D ksft_test_result_fail; - - ksft_print_msg("openat2 unexpectedly returned "); - if (fdpath) - ksft_print_msg("%d['%s']\n", fd, fdpath); - else - ksft_print_msg("%d (%s)\n", fd, strerror(-fd)); + if (test->err >=3D 0) { + EXPECT_GE(fd, 0) { + TH_LOG("openat2 with %s [misalign=3D%d] should succeed, got %d (%s)", + test->name, misalign, + fd, strerror(-fd)); + } + } else { + EXPECT_EQ(test->err, fd) { + if (fdpath) + TH_LOG("openat2 with %s [misalign=3D%d] should fail with %d (%s), go= t %d['%s']", + test->name, misalign, + test->err, + strerror(-test->err), + fd, fdpath); + else + TH_LOG("openat2 with %s [misalign=3D%d] should fail with %d (%s), go= t %d (%s)", + test->name, misalign, + test->err, + strerror(-test->err), + fd, strerror(-fd)); + } } =20 -skip: - if (test->err >=3D 0) - resultfn("openat2 with %s argument [misalign=3D%d] succeeds\n", - test->name, misalign); - else - resultfn("openat2 with %s argument [misalign=3D%d] fails with %d (%s)\= n", - test->name, misalign, test->err, - strerror(-test->err)); - free(copy); free(fdpath); - fflush(stdout); } } } =20 -struct flag_test { - const char *name; - struct open_how how; - int err; -}; - -#define NUM_OPENAT2_FLAG_TESTS 25 - -void test_openat2_flags(void) +/* Verify openat2(2) flag and mode validation. */ +TEST_F(openat2, flag_validation) { struct flag_test tests[] =3D { /* O_TMPFILE is incompatible with O_PATH and O_CREAT. */ @@ -241,20 +237,10 @@ void test_openat2_flags(void) .how.resolve =3D 0, .err =3D -EINVAL }, }; =20 - BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_FLAG_TESTS); - for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { int fd, fdflags =3D -1; char *path, *fdpath =3D NULL; - bool failed =3D false; struct flag_test *test =3D &tests[i]; - void (*resultfn)(const char *msg, ...) =3D ksft_test_result_pass; - - if (!openat2_supported) { - ksft_print_msg("openat2(2) unsupported\n"); - resultfn =3D ksft_test_result_skip; - goto skip; - } =20 path =3D (test->how.flags & O_CREAT) ? "/tmp/ksft.openat2_tmpfile" : "."; unlink(path); @@ -265,74 +251,63 @@ void test_openat2_flags(void) * Skip the testcase if it failed because not supported * by FS. (e.g. a valid O_TMPFILE combination on NFS) */ - ksft_test_result_skip("openat2 with %s fails with %d (%s)\n", - test->name, fd, strerror(-fd)); - goto next; + TH_LOG("openat2 with %s not supported by FS -- skipping", + test->name); + continue; } =20 - if (test->err >=3D 0) - failed =3D (fd < 0); - else - failed =3D (fd !=3D test->err); - if (fd >=3D 0) { - int otherflags; - - fdpath =3D fdreadlink(fd); - fdflags =3D fcntl(fd, F_GETFL); - otherflags =3D fcntl(fd, F_GETFD); - close(fd); - - E_assert(fdflags >=3D 0, "fcntl F_GETFL of new fd"); - E_assert(otherflags >=3D 0, "fcntl F_GETFD of new fd"); - - /* O_CLOEXEC isn't shown in F_GETFL. */ - if (otherflags & FD_CLOEXEC) - fdflags |=3D O_CLOEXEC; - /* O_CREAT is hidden from F_GETFL. */ - if (test->how.flags & O_CREAT) - fdflags |=3D O_CREAT; - if (!(test->how.flags & O_LARGEFILE)) - fdflags &=3D ~O_LARGEFILE; - failed |=3D (fdflags !=3D test->how.flags); - } + if (test->err >=3D 0) { + EXPECT_GE(fd, 0) { + TH_LOG("openat2 with %s should succeed, got %d (%s)", + test->name, fd, strerror(-fd)); + } + if (fd >=3D 0) { + int otherflags; =20 - if (failed) { - resultfn =3D ksft_test_result_fail; + fdpath =3D fdreadlink(_metadata, fd); + fdflags =3D fcntl(fd, F_GETFL); + otherflags =3D fcntl(fd, F_GETFD); + close(fd); =20 - ksft_print_msg("openat2 unexpectedly returned "); - if (fdpath) - ksft_print_msg("%d['%s'] with %X (!=3D %llX)\n", - fd, fdpath, fdflags, - test->how.flags); - else - ksft_print_msg("%d (%s)\n", fd, strerror(-fd)); + ASSERT_GE(fdflags, 0); + ASSERT_GE(otherflags, 0); + + /* O_CLOEXEC isn't shown in F_GETFL. */ + if (otherflags & FD_CLOEXEC) + fdflags |=3D O_CLOEXEC; + /* O_CREAT is hidden from F_GETFL. */ + if (test->how.flags & O_CREAT) + fdflags |=3D O_CREAT; + if (!(test->how.flags & O_LARGEFILE)) + fdflags &=3D ~O_LARGEFILE; + + EXPECT_EQ(fdflags, (int)test->how.flags) { + TH_LOG("openat2 with %s: flags mismatch %X !=3D %llX", + test->name, fdflags, + (unsigned long long)test->how.flags); + } + } + } else { + EXPECT_EQ(test->err, fd) { + if (fd >=3D 0) { + fdpath =3D fdreadlink(_metadata, fd); + TH_LOG("openat2 with %s should fail with %d (%s), got %d['%s']", + test->name, test->err, + strerror(-test->err), + fd, fdpath); + } else { + TH_LOG("openat2 with %s should fail with %d (%s), got %d (%s)", + test->name, test->err, + strerror(-test->err), + fd, strerror(-fd)); + } + } + if (fd >=3D 0) + close(fd); } =20 -skip: - if (test->err >=3D 0) - resultfn("openat2 with %s succeeds\n", test->name); - else - resultfn("openat2 with %s fails with %d (%s)\n", - test->name, test->err, strerror(-test->err)); -next: free(fdpath); - fflush(stdout); } } =20 -#define NUM_TESTS (NUM_OPENAT2_STRUCT_VARIATIONS * NUM_OPENAT2_STRUCT_TEST= S + \ - NUM_OPENAT2_FLAG_TESTS) - -int main(int argc, char **argv) -{ - ksft_print_header(); - ksft_set_plan(NUM_TESTS); - - test_openat2_struct(); - test_openat2_flags(); - - if (ksft_get_fail_cnt() + ksft_get_error_cnt() > 0) - ksft_exit_fail(); - else - ksft_exit_pass(); -} +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/openat2/rename_attack_test.c b/tools/t= esting/selftests/openat2/rename_attack_test.c index aa5699e45729..1f33c34f56be 100644 --- a/tools/testing/selftests/openat2/rename_attack_test.c +++ b/tools/testing/selftests/openat2/rename_attack_test.c @@ -22,44 +22,21 @@ #include #include =20 -#include "kselftest.h" #include "helpers.h" +#include "kselftest_harness.h" =20 -/* Construct a test directory with the following structure: - * - * root/ - * |-- a/ - * | `-- c/ - * `-- b/ - */ -int setup_testdir(void) -{ - int dfd; - char dirname[] =3D "/tmp/ksft-openat2-rename-attack.XXXXXX"; - - /* Make the top-level directory. */ - if (!mkdtemp(dirname)) - ksft_exit_fail_msg("setup_testdir: failed to create tmpdir\n"); - dfd =3D open(dirname, O_PATH | O_DIRECTORY); - if (dfd < 0) - ksft_exit_fail_msg("setup_testdir: failed to open tmpdir\n"); - - E_mkdirat(dfd, "a", 0755); - E_mkdirat(dfd, "b", 0755); - E_mkdirat(dfd, "a/c", 0755); - - return dfd; -} +#define ROUNDS 400000 =20 /* Swap @dirfd/@a and @dirfd/@b constantly. Parent must kill this process.= */ -pid_t spawn_attack(int dirfd, char *a, char *b) +pid_t spawn_attack(struct __test_metadata *_metadata, + int dirfd, char *a, char *b) { pid_t child =3D fork(); if (child !=3D 0) return child; =20 /* If the parent (the test process) dies, kill ourselves too. */ - E_prctl(PR_SET_PDEATHSIG, SIGKILL); + ASSERT_EQ(prctl(PR_SET_PDEATHSIG, SIGKILL), 0); =20 /* Swap @a and @b. */ for (;;) @@ -67,52 +44,90 @@ pid_t spawn_attack(int dirfd, char *a, char *b) exit(1); } =20 -#define NUM_RENAME_TESTS 2 -#define ROUNDS 400000 +/* + * Construct a test directory with the following structure: + * + * root/ + * |-- a/ + * | `-- c/ + * `-- b/ + */ +FIXTURE(rename_attack) { + int dfd; + int afd; + pid_t child; +}; =20 -const char *flagname(int resolve) +FIXTURE_SETUP(rename_attack) { - switch (resolve) { - case RESOLVE_IN_ROOT: - return "RESOLVE_IN_ROOT"; - case RESOLVE_BENEATH: - return "RESOLVE_BENEATH"; - } - return "(unknown)"; + char dirname[] =3D "/tmp/ksft-openat2-rename-attack.XXXXXX"; + + self->dfd =3D -1; + self->afd =3D -1; + self->child =3D 0; + + /* Make the top-level directory. */ + ASSERT_NE(mkdtemp(dirname), NULL); + self->dfd =3D open(dirname, O_PATH | O_DIRECTORY); + ASSERT_GE(self->dfd, 0); + + ASSERT_EQ(mkdirat(self->dfd, "a", 0755), 0); + ASSERT_EQ(mkdirat(self->dfd, "b", 0755), 0); + ASSERT_EQ(mkdirat(self->dfd, "a/c", 0755), 0); + + self->afd =3D openat(self->dfd, "a", O_PATH); + ASSERT_GE(self->afd, 0); + + self->child =3D spawn_attack(_metadata, self->dfd, "a/c", "b"); + ASSERT_GT(self->child, 0); } =20 -void test_rename_attack(int resolve) +FIXTURE_TEARDOWN(rename_attack) { - int dfd, afd; - pid_t child; - void (*resultfn)(const char *msg, ...) =3D ksft_test_result_pass; - int escapes =3D 0, other_errs =3D 0, exdevs =3D 0, eagains =3D 0, success= es =3D 0; + if (self->child > 0) + kill(self->child, SIGKILL); + if (self->afd >=3D 0) + close(self->afd); + if (self->dfd >=3D 0) + close(self->dfd); +} + +FIXTURE_VARIANT(rename_attack) { + int resolve; + const char *name; +}; =20 +FIXTURE_VARIANT_ADD(rename_attack, resolve_beneath) { + .resolve =3D RESOLVE_BENEATH, + .name =3D "RESOLVE_BENEATH", +}; + +FIXTURE_VARIANT_ADD(rename_attack, resolve_in_root) { + .resolve =3D RESOLVE_IN_ROOT, + .name =3D "RESOLVE_IN_ROOT", +}; + +TEST_F_TIMEOUT(rename_attack, test, 120) +{ + int escapes =3D 0, successes =3D 0, other_errs =3D 0, exdevs =3D 0, eagai= ns =3D 0; + char *victim_path =3D "c/../../c/../../c/../../c/../../c/../../c/../../c/= ../../c/../../c/../../c/../../c/../../c/../../c/../../c/../../c/../../c/../= ../c/../../c/../../c/../.."; struct open_how how =3D { .flags =3D O_PATH, - .resolve =3D resolve, + .resolve =3D variant->resolve, }; =20 if (!openat2_supported) { how.resolve =3D 0; - ksft_print_msg("openat2(2) unsupported -- using openat(2) instead\n"); + TH_LOG("openat2(2) unsupported -- using openat(2) instead"); } =20 - dfd =3D setup_testdir(); - afd =3D openat(dfd, "a", O_PATH); - if (afd < 0) - ksft_exit_fail_msg("test_rename_attack: failed to open 'a'\n"); - - child =3D spawn_attack(dfd, "a/c", "b"); - for (int i =3D 0; i < ROUNDS; i++) { int fd; - char *victim_path =3D "c/../../c/../../c/../../c/../../c/../../c/../../c= /../../c/../../c/../../c/../../c/../../c/../../c/../../c/../../c/../../c/..= /../c/../../c/../../c/../.."; =20 if (openat2_supported) - fd =3D sys_openat2(afd, victim_path, &how); + fd =3D sys_openat2(self->afd, victim_path, &how); else - fd =3D sys_openat(afd, victim_path, &how); + fd =3D sys_openat(self->afd, victim_path, &how); =20 if (fd < 0) { if (fd =3D=3D -EAGAIN) @@ -124,37 +139,21 @@ void test_rename_attack(int resolve) else other_errs++; /* unexpected error */ } else { - if (fdequal(fd, afd, NULL)) + if (fdequal(_metadata, fd, self->afd, NULL)) successes++; else escapes++; /* we got an unexpected fd */ } - close(fd); + if (fd >=3D 0) + close(fd); } =20 - if (escapes > 0) - resultfn =3D ksft_test_result_fail; - ksft_print_msg("non-escapes: EAGAIN=3D%d EXDEV=3D%d E=3D%d success= =3D%d\n", - eagains, exdevs, other_errs, successes); - resultfn("rename attack with %s (%d runs, got %d escapes)\n", - flagname(resolve), ROUNDS, escapes); - - /* Should be killed anyway, but might as well make sure. */ - E_kill(child, SIGKILL); + TH_LOG("non-escapes: EAGAIN=3D%d EXDEV=3D%d E=3D%d success=3D%d", + eagains, exdevs, other_errs, successes); + ASSERT_EQ(escapes, 0) { + TH_LOG("rename attack with %s (%d runs, got %d escapes)", + variant->name, ROUNDS, escapes); + } } =20 -#define NUM_TESTS NUM_RENAME_TESTS - -int main(int argc, char **argv) -{ - ksft_print_header(); - ksft_set_plan(NUM_TESTS); - - test_rename_attack(RESOLVE_BENEATH); - test_rename_attack(RESOLVE_IN_ROOT); - - if (ksft_get_fail_cnt() + ksft_get_error_cnt() > 0) - ksft_exit_fail(); - else - ksft_exit_pass(); -} +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/openat2/resolve_test.c b/tools/testing= /selftests/openat2/resolve_test.c index f7acb4300641..eacde59ce158 100644 --- a/tools/testing/selftests/openat2/resolve_test.c +++ b/tools/testing/selftests/openat2/resolve_test.c @@ -14,8 +14,81 @@ #include #include =20 -#include "kselftest.h" #include "helpers.h" +#include "kselftest_harness.h" + +struct resolve_test { + const char *name; + const char *dir; + const char *path; + struct open_how how; + bool pass; + union { + int err; + const char *path; + } out; +}; + +/* + * Verify a single resolve test case. This must be called from within a TE= ST_F + * function with _metadata in scope. + */ +static void verify_resolve_test(struct __test_metadata *_metadata, + int rootfd, int hardcoded_fd, + const struct resolve_test *test) +{ + struct open_how how =3D test->how; + int dfd, fd; + char *fdpath =3D NULL; + + /* Auto-set O_PATH. */ + if (!(how.flags & O_CREAT)) + how.flags |=3D O_PATH; + + if (test->dir) + dfd =3D openat(rootfd, test->dir, O_PATH | O_DIRECTORY); + else + dfd =3D dup(rootfd); + ASSERT_GE(dfd, 0) TH_LOG("failed to open dir '%s': %m", test->dir ?: "."); + ASSERT_EQ(dup2(dfd, hardcoded_fd), hardcoded_fd); + + fd =3D sys_openat2(dfd, test->path, &how); + + if (test->pass) { + EXPECT_GE(fd, 0) { + TH_LOG("%s: expected success, got %d (%s)", + test->name, fd, strerror(-fd)); + } + if (fd >=3D 0) { + EXPECT_TRUE(fdequal(_metadata, fd, rootfd, test->out.path)) { + fdpath =3D fdreadlink(_metadata, fd); + TH_LOG("%s: wrong path '%s', expected '%s'", + test->name, fdpath, + test->out.path ?: "."); + free(fdpath); + } + } + } else { + EXPECT_EQ(test->out.err, fd) { + if (fd >=3D 0) { + fdpath =3D fdreadlink(_metadata, fd); + TH_LOG("%s: expected %d (%s), got %d['%s']", + test->name, test->out.err, + strerror(-test->out.err), fd, fdpath); + free(fdpath); + } else { + TH_LOG("%s: expected %d (%s), got %d (%s)", + test->name, test->out.err, + strerror(-test->out.err), + fd, strerror(-fd)); + } + } + } + + if (fd >=3D 0) + close(fd); + close(dfd); +} =20 /* * Construct a test directory with the following structure: @@ -39,101 +112,110 @@ * |-- absself -> / * |-- self -> ../../root/ * |-- garbageself -> /../../root/ - * |-- passwd -> ../cheeky/../cheeky/../etc/../etc/passwd - * |-- abspasswd -> /../cheeky/../cheeky/../etc/../etc/passwd + * |-- passwd -> ../cheeky/../etc/../etc/passwd + * |-- abspasswd -> /../cheeky/../etc/../etc/passwd * |-- dotdotlink -> ../../../../../../../../../../../../../../etc/pas= swd * `-- garbagelink -> /../../../../../../../../../../../../../../etc/p= asswd */ -int setup_testdir(void) +FIXTURE(openat2_resolve) { + int rootfd; + int hardcoded_fd; + char *hardcoded_fdpath; + char *procselfexe; +}; + +FIXTURE_SETUP(openat2_resolve) { - int dfd, tmpfd; char dirname[] =3D "/tmp/ksft-openat2-testdir.XXXXXX"; + int dfd, tmpfd; + + self->rootfd =3D -1; + self->hardcoded_fd =3D -1; + self->hardcoded_fdpath =3D NULL; + self->procselfexe =3D NULL; + + /* NOTE: We should be checking for CAP_SYS_ADMIN here... */ + if (geteuid() !=3D 0) + SKIP(return, "all tests require euid =3D=3D 0"); + if (!openat2_supported) + SKIP(return, "openat2(2) not supported"); =20 /* Unshare and make /tmp a new directory. */ - E_unshare(CLONE_NEWNS); - E_mount("", "/tmp", "", MS_PRIVATE, ""); + ASSERT_EQ(unshare(CLONE_NEWNS), 0); + ASSERT_EQ(mount("", "/tmp", "", MS_PRIVATE, ""), 0); =20 /* Make the top-level directory. */ - if (!mkdtemp(dirname)) - ksft_exit_fail_msg("setup_testdir: failed to create tmpdir\n"); + ASSERT_NE(mkdtemp(dirname), NULL); dfd =3D open(dirname, O_PATH | O_DIRECTORY); - if (dfd < 0) - ksft_exit_fail_msg("setup_testdir: failed to open tmpdir\n"); + ASSERT_GE(dfd, 0); =20 /* A sub-directory which is actually used for tests. */ - E_mkdirat(dfd, "root", 0755); + ASSERT_EQ(mkdirat(dfd, "root", 0755), 0); tmpfd =3D openat(dfd, "root", O_PATH | O_DIRECTORY); - if (tmpfd < 0) - ksft_exit_fail_msg("setup_testdir: failed to open tmpdir\n"); + ASSERT_GE(tmpfd, 0); close(dfd); dfd =3D tmpfd; =20 - E_symlinkat("/proc/self/exe", dfd, "procexe"); - E_symlinkat("/proc/self/root", dfd, "procroot"); - E_mkdirat(dfd, "root", 0755); + ASSERT_EQ(symlinkat("/proc/self/exe", dfd, "procexe"), 0); + ASSERT_EQ(symlinkat("/proc/self/root", dfd, "procroot"), 0); + ASSERT_EQ(mkdirat(dfd, "root", 0755), 0); =20 /* There is no mountat(2), so use chdir. */ - E_mkdirat(dfd, "mnt", 0755); - E_fchdir(dfd); - E_mount("tmpfs", "./mnt", "tmpfs", MS_NOSUID | MS_NODEV, ""); - E_symlinkat("../mnt/", dfd, "mnt/self"); - E_symlinkat("/mnt/", dfd, "mnt/absself"); - - E_mkdirat(dfd, "etc", 0755); - E_touchat(dfd, "etc/passwd"); - - E_symlinkat("/newfile3", dfd, "creatlink"); - E_symlinkat("etc/", dfd, "reletc"); - E_symlinkat("etc/passwd", dfd, "relsym"); - E_symlinkat("/etc/", dfd, "absetc"); - E_symlinkat("/etc/passwd", dfd, "abssym"); - E_symlinkat("/cheeky", dfd, "abscheeky"); - - E_mkdirat(dfd, "cheeky", 0755); - - E_symlinkat("/", dfd, "cheeky/absself"); - E_symlinkat("../../root/", dfd, "cheeky/self"); - E_symlinkat("/../../root/", dfd, "cheeky/garbageself"); - - E_symlinkat("../cheeky/../etc/../etc/passwd", dfd, "cheeky/passwd"); - E_symlinkat("/../cheeky/../etc/../etc/passwd", dfd, "cheeky/abspasswd"); - - E_symlinkat("../../../../../../../../../../../../../../etc/passwd", - dfd, "cheeky/dotdotlink"); - E_symlinkat("/../../../../../../../../../../../../../../etc/passwd", - dfd, "cheeky/garbagelink"); - - return dfd; + ASSERT_EQ(mkdirat(dfd, "mnt", 0755), 0); + ASSERT_EQ(fchdir(dfd), 0); + ASSERT_EQ(mount("tmpfs", "./mnt", "tmpfs", MS_NOSUID | MS_NODEV, ""), 0); + ASSERT_EQ(symlinkat("../mnt/", dfd, "mnt/self"), 0); + ASSERT_EQ(symlinkat("/mnt/", dfd, "mnt/absself"), 0); + + ASSERT_EQ(mkdirat(dfd, "etc", 0755), 0); + ASSERT_GE(touchat(dfd, "etc/passwd"), 0); + + ASSERT_EQ(symlinkat("/newfile3", dfd, "creatlink"), 0); + ASSERT_EQ(symlinkat("etc/", dfd, "reletc"), 0); + ASSERT_EQ(symlinkat("etc/passwd", dfd, "relsym"), 0); + ASSERT_EQ(symlinkat("/etc/", dfd, "absetc"), 0); + ASSERT_EQ(symlinkat("/etc/passwd", dfd, "abssym"), 0); + ASSERT_EQ(symlinkat("/cheeky", dfd, "abscheeky"), 0); + + ASSERT_EQ(mkdirat(dfd, "cheeky", 0755), 0); + + ASSERT_EQ(symlinkat("/", dfd, "cheeky/absself"), 0); + ASSERT_EQ(symlinkat("../../root/", dfd, "cheeky/self"), 0); + ASSERT_EQ(symlinkat("/../../root/", dfd, "cheeky/garbageself"), 0); + + ASSERT_EQ(symlinkat("../cheeky/../etc/../etc/passwd", + dfd, "cheeky/passwd"), 0); + ASSERT_EQ(symlinkat("/../cheeky/../etc/../etc/passwd", + dfd, "cheeky/abspasswd"), 0); + + ASSERT_EQ(symlinkat("../../../../../../../../../../../../../../etc/passwd= ", + dfd, "cheeky/dotdotlink"), 0); + ASSERT_EQ(symlinkat("/../../../../../../../../../../../../../../etc/passw= d", + dfd, "cheeky/garbagelink"), 0); + + self->rootfd =3D dfd; + + self->hardcoded_fd =3D open("/dev/null", O_RDONLY); + ASSERT_GE(self->hardcoded_fd, 0); + ASSERT_GE(asprintf(&self->hardcoded_fdpath, "self/fd/%d", + self->hardcoded_fd), 0); + ASSERT_GE(asprintf(&self->procselfexe, "/proc/%d/exe", getpid()), 0); } =20 -struct basic_test { - const char *name; - const char *dir; - const char *path; - struct open_how how; - bool pass; - union { - int err; - const char *path; - } out; -}; - -#define NUM_OPENAT2_OPATH_TESTS 88 - -void test_openat2_opath_tests(void) +FIXTURE_TEARDOWN(openat2_resolve) { - int rootfd, hardcoded_fd; - char *procselfexe, *hardcoded_fdpath; - - E_asprintf(&procselfexe, "/proc/%d/exe", getpid()); - rootfd =3D setup_testdir(); - - hardcoded_fd =3D open("/dev/null", O_RDONLY); - E_assert(hardcoded_fd >=3D 0, "open fd to hardcode"); - E_asprintf(&hardcoded_fdpath, "self/fd/%d", hardcoded_fd); + free(self->procselfexe); + free(self->hardcoded_fdpath); + if (self->hardcoded_fd >=3D 0) + close(self->hardcoded_fd); + if (self->rootfd >=3D 0) + close(self->rootfd); +} =20 - struct basic_test tests[] =3D { - /** RESOLVE_BENEATH **/ +/* Attempts to cross the dirfd should be blocked with -EXDEV. */ +TEST_F(openat2_resolve, resolve_beneath) +{ + struct resolve_test tests[] =3D { /* Attempts to cross dirfd should be blocked. */ { .name =3D "[beneath] jump to /", .path =3D "/", .how.resolve =3D RESOLVE_BENEATH, @@ -206,9 +288,17 @@ void test_openat2_opath_tests(void) { .name =3D "[beneath] tricky absolute + garbage link outside $root", .path =3D "abscheeky/garbagelink", .how.resolve =3D RESOLVE_BENEATH, .out.err =3D -EXDEV, .pass =3D false }, + }; + + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) + verify_resolve_test(_metadata, self->rootfd, + self->hardcoded_fd, &tests[i]); +} =20 - /** RESOLVE_IN_ROOT **/ - /* All attempts to cross the dirfd will be scoped-to-root. */ +/* All attempts to cross the dirfd will be scoped-to-root. */ +TEST_F(openat2_resolve, resolve_in_root) +{ + struct resolve_test tests[] =3D { { .name =3D "[in_root] jump to /", .path =3D "/", .how.resolve =3D RESOLVE_IN_ROOT, .out.path =3D NULL, .pass =3D true }, @@ -297,8 +387,17 @@ void test_openat2_opath_tests(void) .how.mode =3D 0700, .how.resolve =3D RESOLVE_IN_ROOT, .out.path =3D "newfile3", .pass =3D true }, + }; =20 - /** RESOLVE_NO_XDEV **/ + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) + verify_resolve_test(_metadata, self->rootfd, + self->hardcoded_fd, &tests[i]); +} + +/* Crossing mount boundaries should be blocked. */ +TEST_F(openat2_resolve, resolve_no_xdev) +{ + struct resolve_test tests[] =3D { /* Crossing *down* into a mountpoint is disallowed. */ { .name =3D "[no_xdev] cross into $mnt", .path =3D "mnt", .how.resolve =3D RESOLVE_NO_XDEV, @@ -347,10 +446,19 @@ void test_openat2_opath_tests(void) .out.err =3D -EXDEV, .pass =3D false }, /* Except magic-link jumps inside the same vfsmount. */ { .name =3D "[no_xdev] jump through magic-link to same procfs", - .dir =3D "/proc", .path =3D hardcoded_fdpath, .how.resolve =3D RESOLVE= _NO_XDEV, - .out.path =3D "/proc", .pass =3D true, }, + .dir =3D "/proc", .path =3D self->hardcoded_fdpath, .how.resolve =3D R= ESOLVE_NO_XDEV, + .out.path =3D "/proc", .pass =3D true, }, + }; + + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) + verify_resolve_test(_metadata, self->rootfd, + self->hardcoded_fd, &tests[i]); +} =20 - /** RESOLVE_NO_MAGICLINKS **/ +/* Procfs-style magic-link resolution should be blocked. */ +TEST_F(openat2_resolve, resolve_no_magiclinks) +{ + struct resolve_test tests[] =3D { /* Regular symlinks should work. */ { .name =3D "[no_magiclinks] ordinary relative symlink", .path =3D "relsym", .how.resolve =3D RESOLVE_NO_MAGICLINKS, @@ -365,7 +473,7 @@ void test_openat2_opath_tests(void) { .name =3D "[no_magiclinks] normal path to magic-link with O_NOFOLLOW", .path =3D "/proc/self/exe", .how.flags =3D O_NOFOLLOW, .how.resolve =3D RESOLVE_NO_MAGICLINKS, - .out.path =3D procselfexe, .pass =3D true }, + .out.path =3D self->procselfexe, .pass =3D true }, { .name =3D "[no_magiclinks] symlink to magic-link path component", .path =3D "procroot/etc", .how.resolve =3D RESOLVE_NO_MAGICLINKS, .out.err =3D -ELOOP, .pass =3D false }, @@ -376,8 +484,17 @@ void test_openat2_opath_tests(void) .path =3D "/proc/self/root/etc", .how.flags =3D O_NOFOLLOW, .how.resolve =3D RESOLVE_NO_MAGICLINKS, .out.err =3D -ELOOP, .pass =3D false }, + }; + + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) + verify_resolve_test(_metadata, self->rootfd, + self->hardcoded_fd, &tests[i]); +} =20 - /** RESOLVE_NO_SYMLINKS **/ +/* All symlink resolution should be blocked. */ +TEST_F(openat2_resolve, resolve_no_symlinks) +{ + struct resolve_test tests[] =3D { /* Normal paths should work. */ { .name =3D "[no_symlinks] ordinary path to '.'", .path =3D ".", .how.resolve =3D RESOLVE_NO_SYMLINKS, @@ -436,88 +553,9 @@ void test_openat2_opath_tests(void) .out.err =3D -ELOOP, .pass =3D false }, }; =20 - BUILD_BUG_ON(ARRAY_SIZE(tests) !=3D NUM_OPENAT2_OPATH_TESTS); - - for (int i =3D 0; i < ARRAY_SIZE(tests); i++) { - int dfd, fd; - char *fdpath =3D NULL; - bool failed; - void (*resultfn)(const char *msg, ...) =3D ksft_test_result_pass; - struct basic_test *test =3D &tests[i]; - - if (!openat2_supported) { - ksft_print_msg("openat2(2) unsupported\n"); - resultfn =3D ksft_test_result_skip; - goto skip; - } - - /* Auto-set O_PATH. */ - if (!(test->how.flags & O_CREAT)) - test->how.flags |=3D O_PATH; - - if (test->dir) - dfd =3D openat(rootfd, test->dir, O_PATH | O_DIRECTORY); - else - dfd =3D dup(rootfd); - E_assert(dfd, "failed to openat root '%s': %m", test->dir); - - E_dup2(dfd, hardcoded_fd); - - fd =3D sys_openat2(dfd, test->path, &test->how); - if (test->pass) - failed =3D (fd < 0 || !fdequal(fd, rootfd, test->out.path)); - else - failed =3D (fd !=3D test->out.err); - if (fd >=3D 0) { - fdpath =3D fdreadlink(fd); - close(fd); - } - close(dfd); - - if (failed) { - resultfn =3D ksft_test_result_fail; - - ksft_print_msg("openat2 unexpectedly returned "); - if (fdpath) - ksft_print_msg("%d['%s']\n", fd, fdpath); - else - ksft_print_msg("%d (%s)\n", fd, strerror(-fd)); - } - -skip: - if (test->pass) - resultfn("%s gives path '%s'\n", test->name, - test->out.path ?: "."); - else - resultfn("%s fails with %d (%s)\n", test->name, - test->out.err, strerror(-test->out.err)); - - fflush(stdout); - free(fdpath); - } - - free(procselfexe); - close(rootfd); - - free(hardcoded_fdpath); - close(hardcoded_fd); + for (int i =3D 0; i < ARRAY_SIZE(tests); i++) + verify_resolve_test(_metadata, self->rootfd, + self->hardcoded_fd, &tests[i]); } =20 -#define NUM_TESTS NUM_OPENAT2_OPATH_TESTS - -int main(int argc, char **argv) -{ - ksft_print_header(); - ksft_set_plan(NUM_TESTS); - - /* NOTE: We should be checking for CAP_SYS_ADMIN here... */ - if (geteuid() !=3D 0) - ksft_exit_skip("all tests require euid =3D=3D 0\n"); - - test_openat2_opath_tests(); - - if (ksft_get_fail_cnt() + ksft_get_error_cnt() > 0) - ksft_exit_fail(); - else - ksft_exit_pass(); -} +TEST_HARNESS_MAIN --=20 2.53.0