Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16ECEC4332F for ; Fri, 3 Nov 2023 15:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229454AbjKCPM7 (ORCPT ); Fri, 3 Nov 2023 11:12:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230328AbjKCPM6 (ORCPT ); Fri, 3 Nov 2023 11:12:58 -0400 Received: from smtp-42a9.mail.infomaniak.ch (smtp-42a9.mail.infomaniak.ch [IPv6:2001:1600:3:17::42a9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD79E123 for ; Fri, 3 Nov 2023 08:12:52 -0700 (PDT) Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4SMPPZ5Dc3zMqHwH; Fri, 3 Nov 2023 15:12:50 +0000 (UTC) Received: from unknown by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4SMPPY4lgZzMpnxX; Fri, 3 Nov 2023 16:12:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=digikod.net; s=20191114; t=1699024370; bh=WtZqmwXUnq57o+AzLTJgU+VUoIl1dLU14BJXPCU6YEM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=coTe0LEzZzUt1OyNEJfw7zEjaxThNLr+3pcCk7t+n2U974S5jx6Nt/8g0h/oLvMtQ u0MS1iCP1WTdxFBLcU2WP+Q4ONEv36Q+nJ3E9MoQmo2Z/pEfZLqD4nUDfmtlZnQtcO 6RGuodg8zb2tzYGSi4kcP4Tc7JXCz17+xdBiZIPs= Date: Fri, 3 Nov 2023 16:12:45 +0100 From: =?utf-8?Q?Micka=C3=ABl_Sala=C3=BCn?= To: =?utf-8?Q?G=C3=BCnther?= Noack Cc: Christian Brauner , linux-security-module@vger.kernel.org, Jeff Xu , Jorge Lucangeli Obes , Allen Webb , Dmitry Torokhov , Paul Moore , Konstantin Meskhidze , Matt Bobrowski , linux-fsdevel@vger.kernel.org, Theodore Ts'o Subject: Re: [PATCH v3 0/5] Landlock: IOCTL support Message-ID: <20231103.eegh9eg2fieN@digikod.net> References: <20230826.ohtooph0Ahmu@digikod.net> <20230904.aiWae8eineo4@digikod.net> <20230911.jie6Rai8ughe@digikod.net> <20231020.moefooYeV9ei@digikod.net> <20231026.oiPeosh1yieg@digikod.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Infomaniak-Routing: alpha Precedence: bulk List-ID: On Fri, Nov 03, 2023 at 02:06:53PM +0100, Günther Noack wrote: > Hello Mickaël! > > Thanks for the review! > > On Thu, Oct 26, 2023 at 04:55:30PM +0200, Mickaël Salaün wrote: > > The third column "IOCTL unhandled" is not reflected here. What about > > this patch? > > > > if (!(handled & LANDLOCK_ACCESS_FS_IOCTL)) { > > return am | dst; > > } > > You are right that this needs special treatment. The reasoning is the scenario > where a user creates a ruleset where LANDLOCK_ACCESS_FS_READ_FILE is handled, > but LANDLOCK_ACCESS_FS_IOCTL is not. In that case, when a file is opened for > which we do not have the READ_FILE access right, without your additional check, > the IOCTLs associated with READ_FILE would be forbidden. But this is also a > Landlock usage that was possible before the introduction of the IOCTL handling, > and so all IOCTLs should work in that case. > > > > > > if (handled & src) { > > > /* If "src" access right is handled, populate "dst" from "src". */ > > > return am | ((am & src) ? dst : 0); > > > } else { > > > /* Otherwise, populate "dst" flag from "ioctl" flag. */ > > > return am | ((am & LANDLOCK_ACCESS_FS_IOCTL) ? dst : 0); > > > } > > > } > > > > > > static access_mask_t expand_all_ioctl(access_mask_t handled, access_mask_t am) > > > { > > > > Instead of reapeating "am | " in expand_ioctl() and assigning am several > > times in expand_all_ioctl(), you could simply do something like that: > > > > return am | > > expand_ioctl(handled, am, ...) | > > expand_ioctl(handled, am, ...) | > > expand_ioctl(handled, am, ...); > > Agreed, this is more elegant. Will do. > > > > > am = expand_ioctl(handled, am, > > > LANDLOCK_ACCESS_FS_WRITE_FILE, > > > IOCTL_CMD_G1 | IOCTL_CMD_G2 | IOCTL_CMD_G4); > > > am = expand_ioctl(handled, am, > > > LANDLOCK_ACCESS_FS_READ_FILE, > > > IOCTL_CMD_G1 | IOCTL_CMD_G2 | IOCTL_CMD_G3); > > > am = expand_ioctl(handled, am, > > > LANDLOCK_ACCESS_FS_READ_DIR, > > > IOCTL_CMD_G1); > > > return am; > > > } > > > > > > and then during the installing of a ruleset, we'd call > > > expand_all_ioctl(handled, access) for each specified file access, and > > > expand_all_ioctl(handled, handled) for the handled access rights, > > > to populate the synthetic IOCTL_CMD_G* access rights. > > > > We can do these transformations directly in the new > > landlock_add_fs_access_mask() and landlock_append_fs_rule(). > > Working on these changes, the location of these transformations is one of the > last outstanding problems that I don't like yet. > > I have added the expansion code to landlock_add_fs_access_mask() and > landlock_append_fs_rule() as you suggested. > > This works, but as a result, this (somewhat complicated) expansion logic is now > part of the ruleset.o module, where it seems a bit too FS-specific. I think > that maybe we can pull this out further, but I'll probably send you a patch set > with the current status before doing that, so that we are on the same page. I guess we can put the expand functions in fs.c . But at that point we need an actual patch to discuss such details. > > > > Please base the next series on > > https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/log/?h=next > > This branch might be rebased from time to time, but only minor changes > > will get there. > > OK, will do. > > > In summary, I'll send a patch soon. > > FYI, some open questions I still have are: > > * Logic > * How will userspace libraries handle best-effort fallback, > when expanded IOCTL access rights come into play? > (Still need to think about this more.) If users set the GFX right, the library should fallback to the IOCTL right if GFX is not supported. > * Internal code layout > * Move expansion logic out of ruleset.o module into syscalls.o? > * Find more appropriate names for IOCTL_CMD_G1,...,IOCTL_CMD_G4 Actually, I think these groups should be static const variables defined in the function that uses them, so the naming would not change much. Maybe something like ioctl_groupN? > > but we can discuss these in the context of the next patch set. Definitely > > —Günther