Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp414976rdb; Thu, 22 Feb 2024 07:38:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXfZ5nE6BV5kMGZ1UHlHMsEgIETdgiPhQUkuArMP43DOIUE3QHVSYnHk5pYRGLVd4glU2eeDb+OvUmIivSR9R7oKkIhPMme8oSdT2RMfQ== X-Google-Smtp-Source: AGHT+IGWMoF5v/CBM6nRN7NE0ogboEyUQ2VXFbsJaRRwjdiZzTVKKK0dAvkbznCQYhCiSbVm0qDe X-Received: by 2002:aa7:d8d4:0:b0:565:50d4:c6dc with SMTP id k20-20020aa7d8d4000000b0056550d4c6dcmr584041eds.16.1708616302969; Thu, 22 Feb 2024 07:38:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708616302; cv=pass; d=google.com; s=arc-20160816; b=jBroQHmQXicARtdnOhfrhOfb9/4cfeXdQLGDygWJbVKzXscRmUWZonPdFK13mTMRsn SZC4SO5g2qNTXKm3lZqcEkwR04vFZ+D8ACLp5av2/3BUVrF6rtVtYP2q6dh6A5ApCP6S Z4Km3XRR7xc0kQ1Pg2zo5RK76g64/RIC/hsXXrs4azrkmstAvZscvEuTWLiZ3Aae9In2 01NaQsjlNwTuf7J+PerJVEAKN6nKGigM2g2URV96EZpsZOExlA1SIpGth4Vu1b1x2NZ1 YhU6hUnJkUKPCjw8VSL9BeZ1TCxbYDdfo+OijsRWYN/FT8brUZT4/FGR22QZIz7Pjt4K CKvw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=JayIOxIJIQUYsV7XFkBC0hofnZXFrrlcGNnnDBW3aBQ=; fh=biYyjGNYlDBVdXso5Gb4P2wdDwErPWKCqEz3aryGDbQ=; b=qYJsIkRsRcQC3W5Yu9VjPJilt/l0kut3ABk2/SHMhq61EQvqP+46vMrOyTd599sLEr g1hYPEWUxwpDnhCBtc5b4xXze44uT3AEVVCX/IZJY3TP+fejS2gHw+/DChlLbb7KsTKI di8klYNUUuAgaxBpEmr5ZWjXgEQcpQCND78PY02bDGXnihJbD8xH5dwNJhE5+Fne9Q5U rufRBg7vwo63/Yu0IxejXp8nF1btCcUwx/dntDmfC9JSyFMMzTodhf3UFMTLeLDa42ga Ed/0mIiy69yqTYhjFTwENFKESROd59PcmnjS00b+IENe4BKpjv2OWvr3wHFg3fSi8wFo 7a8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JHRXk4KX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-76786-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76786-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id s19-20020a50d493000000b005642ea0a7besi4996469edi.164.2024.02.22.07.38.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 07:38:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76786-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JHRXk4KX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-76786-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76786-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B2FE81F2602D for ; Thu, 22 Feb 2024 15:38:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 73D4D14E2D7; Thu, 22 Feb 2024 15:38:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JHRXk4KX" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E2BA14A093; Thu, 22 Feb 2024 15:38:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708616286; cv=none; b=rg7dGxbnIcYKFDHnEHiS67cAiSkIaGdhKy0vVOYR3os8540Y4+w0wFSnOluPaklgS3CKTZ3gXBX3KtZP3Z1EnSCyu+UfbqsFMYLnvyKC55SnbxUjmbA1q3IMqR7RrypEHBjfkWnmudJa7i1IHO0WBr7r9PTDC3YSOhX7Mt4AwLY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708616286; c=relaxed/simple; bh=qu0fwWOeh/I6+oNa5FUXimTTggVsBjqh5xvuL/Jm3Rc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZPvJdIuxviy/Ith7ypJRGp0bzZFV/m9UecqAF/Qe7R1xvNmpyB+TxeJud1rUlKn/dIg0qDXsxB20KfZZb0xvQ8PlSfOIxaYDN3Ze6pMbxJOdNroVLlMl+MXAfWB9WtLlsT7ZVDw9ABt+CN7TYpHn1zFaWVzkyUVGlcL2V5/Cqqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JHRXk4KX; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 018E9C433F1; Thu, 22 Feb 2024 15:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708616286; bh=qu0fwWOeh/I6+oNa5FUXimTTggVsBjqh5xvuL/Jm3Rc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JHRXk4KXwfOwKzU4gL5Z9zYoGPkNdMdD2jERLNEP24+s4Qvj36nxDojqPrvri5p7u IQ1kgoTttatl9OZdO/RmTNPNP8qW5Gqsmq6pp4IHEEhyxKB6FQSQjTmCy3sbhuj4oh iWzU6zrkqvjg+3p53nsnVdTWiXr4eke0AU/3o39SG02vzoCk64/DHKUKU2hcyDK1Nk Fp8bflMVrnJ//9AjPweq01bqfSB66Dj569+O0yt3ACuTrJmAKUiBBCXa6x3LAYEmIT kInLmnVGUY8IcwrLz1obiPXwxkzc3+HHyqplVk67LBJhgtS7Xof+wvobaAGKByMGFs y82eq/oIFWpgg== Date: Thu, 22 Feb 2024 09:38:04 -0600 From: "Seth Forshee (DigitalOcean)" To: Christian Brauner Cc: Serge Hallyn , Paul Moore , Eric Paris , James Morris , Alexander Viro , Jan Kara , Stephen Smalley , Ondrej Mosnacek , Casey Schaufler , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , "Matthew Wilcox (Oracle)" , Jonathan Corbet , Miklos Szeredi , Amir Goldstein , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, audit@vger.kernel.org, selinux@vger.kernel.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: Re: [PATCH v2 06/25] capability: provide helpers for converting between xattrs and vfs_caps Message-ID: References: <20240221-idmap-fscap-refactor-v2-0-3039364623bd@kernel.org> <20240221-idmap-fscap-refactor-v2-6-3039364623bd@kernel.org> <20240222-wieweit-eiskunstlauf-0dbab2007754@brauner> 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=us-ascii Content-Disposition: inline In-Reply-To: <20240222-wieweit-eiskunstlauf-0dbab2007754@brauner> On Thu, Feb 22, 2024 at 04:20:08PM +0100, Christian Brauner wrote: > > + if ((magic_etc & VFS_CAP_REVISION_MASK) != VFS_CAP_REVISION_1) { > > + vfs_caps->permitted.val += (u64)le32_to_cpu(caps->data[1].permitted) << 32; > > + vfs_caps->inheritable.val += (u64)le32_to_cpu(caps->data[1].inheritable) << 32; > > That + makes this even more difficult to read. This should be rewritten. Do you meant that you would prefer |= to +=, or do you have something else in mind? Note though that this is code that I didn't change, just moved. Generally I tried to avoid changing code if it wasn't necessary for the aims of this series. > > +ssize_t vfs_caps_to_xattr(struct mnt_idmap *idmap, > > + struct user_namespace *dest_userns, > > + const struct vfs_caps *vfs_caps, > > + void *data, size_t size) > > +{ > > + struct vfs_ns_cap_data *caps = data; > > + int ret; > > This should very likely be ssize_t ret. Indeed, I'll fix that.