Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rgUMC3O8" Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD421725 for ; Fri, 24 Nov 2023 09:30:56 -0800 (PST) Received: by mail-ej1-x649.google.com with SMTP id a640c23a62f3a-a01c7b09335so160099866b.1 for ; Fri, 24 Nov 2023 09:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700847055; x=1701451855; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date :message-id:reply-to; bh=UjpIRKfLH4jxjWvtSwMRZAc4j0fbDDTVnVDRRUKAiaw=; b=rgUMC3O8UVczhH3lj47JxOHVRZSE4a6KzUSFZBW55WGUNnw9ElUuWQa17cDZt2yqOe 99CUrSfesva4j84mbqwTNRVfHQI2vLc8ReTLXmwVeYhSLqlTyYvRzf5cED3dsv/iArj9 NDs2vKdJIsuMCjwCnEj6ag6Hly47wDTPNhtFpWlaTI/WU9IRwEOkw0lW2s7K0xDtG40z 3pRFYqMVX/djiR8GLWz1bqMejLDozcE+BTehg1GdOWKzxz464O55kVo8f/8uabS0fsQO yudzlK8H6YxbUUdtcuiBUI97gae9UX1VgGzbaLpHg+B5s/XRV/0ytfKI8wbSH30Gv3qh PRZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700847055; x=1701451855; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UjpIRKfLH4jxjWvtSwMRZAc4j0fbDDTVnVDRRUKAiaw=; b=HCUkMVl3JKs8rOtj+pnLxQE1lCgLXQgReD28gDCbS2UrEVm/sEEuGSsFab+vdAzYh7 4fHc1jf/AQklR+WR/llphZnRkxatHT+ngFuiuDbDRYRMZOuLHwJMnCeaFcz4Ej4jS/Cw Hroge0f2g9aRzGCQCEk84Bmmysj4g0DzbKo+94TemcDguRxpVfMg7tsStnPhVTUlnF7+ vPwHeoLTXslrMiWVU4DzPL3bGpcYrLe0G7mxtSrVUy6Aex1Q5/MCgjv4v2+2Cupz9FPh xDXdYbqGl2xQh6DT6upUW6H5f3pGWhdNIUKmncMiUmuSCs1DYAkc7GkI/SIHVIafNnkk h2+g== X-Gm-Message-State: AOJu0YwQjItzZuRRgxqVBrq1NcEYvAGI2pVIA/DKY+e56SmLBSV8RzOs eti3Qn+JB1gcKAg7t8I/fFMJUY/xNgo= X-Google-Smtp-Source: AGHT+IEy5SIFUl2uvvtdFklLTCxu6IqjYuTbBXyqtL81jLUQfBfoGKOg5o8HHluxKV91gZA1yUxWw4eq1B8= X-Received: from sport.zrh.corp.google.com ([2a00:79e0:9d:4:9429:6eed:3418:ad8a]) (user=gnoack job=sendgmr) by 2002:a17:907:7719:b0:9fa:e690:ee04 with SMTP id kw25-20020a170907771900b009fae690ee04mr34165ejc.11.1700847054827; Fri, 24 Nov 2023 09:30:54 -0800 (PST) Date: Fri, 24 Nov 2023 18:30:26 +0100 In-Reply-To: <20231124173026.3257122-1-gnoack@google.com> Message-Id: <20231124173026.3257122-10-gnoack@google.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20231124173026.3257122-1-gnoack@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Subject: [PATCH v6 9/9] landlock: Document IOCTL support From: "=?UTF-8?q?G=C3=BCnther=20Noack?=" To: linux-security-module@vger.kernel.org, "=?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?=" Cc: Jeff Xu , Jorge Lucangeli Obes , Allen Webb , Dmitry Torokhov , Paul Moore , Konstantin Meskhidze , Matt Bobrowski , linux-fsdevel@vger.kernel.org, "=?UTF-8?q?G=C3=BCnther=20Noack?=" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable In the paragraph above the fallback logic, use the shorter phrasing from the landlock(7) man page. Signed-off-by: G=C3=BCnther Noack --- Documentation/userspace-api/landlock.rst | 74 +++++++++++++++++++----- 1 file changed, 59 insertions(+), 15 deletions(-) diff --git a/Documentation/userspace-api/landlock.rst b/Documentation/users= pace-api/landlock.rst index 2e3822677061..68498ca64dc9 100644 --- a/Documentation/userspace-api/landlock.rst +++ b/Documentation/userspace-api/landlock.rst @@ -75,7 +75,8 @@ to be explicit about the denied-by-default access rights. LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM | LANDLOCK_ACCESS_FS_REFER | - LANDLOCK_ACCESS_FS_TRUNCATE, + LANDLOCK_ACCESS_FS_TRUNCATE | + LANDLOCK_ACCESS_FS_IOCTL, .handled_access_net =3D LANDLOCK_ACCESS_NET_BIND_TCP | LANDLOCK_ACCESS_NET_CONNECT_TCP, @@ -84,10 +85,10 @@ to be explicit about the denied-by-default access right= s. Because we may not know on which kernel version an application will be executed, it is safer to follow a best-effort security approach. Indeed, = we should try to protect users as much as possible whatever the kernel they a= re -using. To avoid binary enforcement (i.e. either all security features or -none), we can leverage a dedicated Landlock command to get the current ver= sion -of the Landlock ABI and adapt the handled accesses. Let's check if we sho= uld -remove access rights which are only supported in higher versions of the AB= I. +using. + +To be compatible with older Linux versions, we detect the available Landlo= ck ABI +version, and only use the available subset of access rights: =20 .. code-block:: c =20 @@ -113,6 +114,10 @@ remove access rights which are only supported in highe= r versions of the ABI. ruleset_attr.handled_access_net &=3D ~(LANDLOCK_ACCESS_NET_BIND_TCP | LANDLOCK_ACCESS_NET_CONNECT_TCP); + __attribute__((fallthrough)); + case 4: + /* Removes LANDLOCK_ACCESS_FS_IOCTL for ABI < 5 */ + ruleset_attr.handled_access_fs &=3D ~LANDLOCK_ACCESS_FS_IOCTL; } =20 This enables to create an inclusive ruleset that will contain our rules. @@ -224,6 +229,7 @@ access rights per directory enables to change the locat= ion of such directory without relying on the destination directory access rights (except those t= hat are required for this operation, see ``LANDLOCK_ACCESS_FS_REFER`` documentation). + Having self-sufficient hierarchies also helps to tighten the required acce= ss rights to the minimal set of data. This also helps avoid sinkhole directo= ries, i.e. directories where data can be linked to but not linked from. Howeve= r, @@ -317,18 +323,24 @@ It should also be noted that truncating files does no= t require the system call, this can also be done through :manpage:`open(2)` with the fla= gs ``O_RDONLY | O_TRUNC``. =20 -When opening a file, the availability of the ``LANDLOCK_ACCESS_FS_TRUNCATE= `` -right is associated with the newly created file descriptor and will be use= d for -subsequent truncation attempts using :manpage:`ftruncate(2)`. The behavio= r is -similar to opening a file for reading or writing, where permissions are ch= ecked -during :manpage:`open(2)`, but not during the subsequent :manpage:`read(2)= ` and +The truncate right is associated with the opened file (see below). + +Rights associated with file descriptors +--------------------------------------- + +When opening a file, the availability of the ``LANDLOCK_ACCESS_FS_TRUNCATE= `` and +``LANDLOCK_ACCESS_FS_IOCTL`` rights is associated with the newly created f= ile +descriptor and will be used for subsequent truncation and ioctl attempts u= sing +:manpage:`ftruncate(2)` and :manpage:`ioctl(2)`. The behavior is similar = to +opening a file for reading or writing, where permissions are checked durin= g +:manpage:`open(2)`, but not during the subsequent :manpage:`read(2)` and :manpage:`write(2)` calls. =20 -As a consequence, it is possible to have multiple open file descriptors fo= r the -same file, where one grants the right to truncate the file and the other d= oes -not. It is also possible to pass such file descriptors between processes, -keeping their Landlock properties, even when these processes do not have a= n -enforced Landlock ruleset. +As a consequence, it is possible to have multiple open file descriptors +referring to the same file, where one grants the truncate or ioctl right a= nd the +other does not. It is also possible to pass such file descriptors between +processes, keeping their Landlock properties, even when these processes do= not +have an enforced Landlock ruleset. =20 Compatibility =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -457,6 +469,28 @@ Memory usage Kernel memory allocated to create rulesets is accounted and can be restric= ted by the Documentation/admin-guide/cgroup-v1/memory.rst. =20 +IOCTL support +------------- + +The ``LANDLOCK_ACCESS_FS_IOCTL`` access right restricts the use of +:manpage:`ioctl(2)`, but it only applies to newly opened files. This mean= s +specifically that pre-existing file descriptors like stdin, stdout and std= err +are unaffected. + +Users should be aware that TTY devices have traditionally permitted to con= trol +other processes on the same TTY through the ``TIOCSTI`` and ``TIOCLINUX`` = IOCTL +commands. It is therefore recommended to close inherited TTY file descrip= tors, +or to reopen them from ``/proc/self/fd/*`` without the +``LANDLOCK_ACCESS_FS_IOCTL`` right, if possible. The :manpage:`isatty(3)` +function checks whether a given file descriptor is a TTY. + +Landlock's IOCTL support is coarse-grained at the moment, but may become m= ore +fine-grained in the future. Until then, users are advised to establish th= e +guarantees that they need through the file hierarchy, by only permitting t= he +``LANDLOCK_ACCESS_FS_IOCTL`` right on files where it is really harmless. = In +cases where you can control the mounts, the ``nodev`` mount option can hel= p to +rule out that device files can be accessed. + Previous limitations =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 @@ -494,6 +528,16 @@ bind and connect actions to only a set of allowed port= s thanks to the new ``LANDLOCK_ACCESS_NET_BIND_TCP`` and ``LANDLOCK_ACCESS_NET_CONNECT_TCP`` access rights. =20 +IOCTL (ABI < 5) +--------------- + +IOCTL operations could not be denied before the fifth Landlock ABI, so +:manpage:`ioctl(2)` is always allowed when using a kernel that only suppor= ts an +earlier ABI. + +Starting with the Landlock ABI version 5, it is possible to restrict the u= se of +:manpage:`ioctl(2)` using the new ``LANDLOCK_ACCESS_FS_IOCTL`` access righ= t. + .. _kernel_support: =20 Kernel support --=20 2.43.0.rc1.413.gea7ed67945-goog