From nobody Mon Apr 6 21:32:31 2026 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 D33CFECAAD1 for ; Thu, 1 Sep 2022 15:27:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234416AbiIAP1O (ORCPT ); Thu, 1 Sep 2022 11:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234536AbiIAP0n (ORCPT ); Thu, 1 Sep 2022 11:26:43 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD03874BAE for ; Thu, 1 Sep 2022 08:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662045998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xXJ3eu32792Tz+PNWkqX8ynt0TaLdrtHwSsiZCTO97I=; b=Q8qT4cM/YSCwMpZ/Ve7v+i+7nKqEMhxClMNI36Klfgqa7AxMmPXzJf4NVmkGs9I/fasJgt zrB0qptmsM4u/XCCvs5xjrfYquuJ7ulDr8PdmKNknNHuAoVMfsZyyc26ysXSg4Nci6YUhI NZkdDLr4W9hXRDQ/2zGd4+X8w69lkmY= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-632-bxq4Pjz_Nxug6zJsEEQw2A-1; Thu, 01 Sep 2022 11:26:36 -0400 X-MC-Unique: bxq4Pjz_Nxug6zJsEEQw2A-1 Received: by mail-ej1-f71.google.com with SMTP id xh12-20020a170906da8c00b007413144e87fso6933811ejb.14 for ; Thu, 01 Sep 2022 08:26:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=xXJ3eu32792Tz+PNWkqX8ynt0TaLdrtHwSsiZCTO97I=; b=EQt5Ko0rFQkeqsEKuhhM3+hRaZCViIdM+BlUKlw8DuKdjXYZkjA6KQQssgG+A+SQh1 sDVeJ/R2xD11jS0Q0O7Rnn3ECsB2GhPx+6zSOL2FJvsepmq9bPuhkOflOusdZUYRx3w/ hTr5oTmxMJ+q3dBX6g4pcptmCsm3SHs7svMW0TMvcgVxEeZH61vhLoJGJneHwZgdvuGj KfADKDm/KiIIe/6Rb5aotou5poy/BgrWF9Se2BDiRhYBWOBwRnUsXKboi/cpWj6opKoS TP4Ox4LLHWkGAq2EKGmQJPg8VnIiOX3S374p1YMNuXdpqwYRFsXu+NZpGLs1OH9tWeQg 4lDw== X-Gm-Message-State: ACgBeo0O73agQIuNt/sEpEM8m2gpUETu1YbS0izvbiZ9kgcPhSAQw1ud MeDTq8aer5hnUQ4jTerIk2HN5mFXBIu7VWz40teAKNkc7rv8AzMUfHKlpbtxGkNcT6Qs3/Z0UEw JCvt3/CnM4A9chvQTgqMeTNA4 X-Received: by 2002:a17:906:845c:b0:730:bbf1:196a with SMTP id e28-20020a170906845c00b00730bbf1196amr24608315ejy.13.1662045995425; Thu, 01 Sep 2022 08:26:35 -0700 (PDT) X-Google-Smtp-Source: AA6agR5FRde2+0Kq+Aw/cF6maS0iAuZMFCEh7wb5iWZ1StV35X9kMHScj7jMEScvxLEBUmONF9VBmg== X-Received: by 2002:a17:906:845c:b0:730:bbf1:196a with SMTP id e28-20020a170906845c00b00730bbf1196amr24608307ejy.13.1662045995247; Thu, 01 Sep 2022 08:26:35 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id o23-20020a170906775700b00730bfe6adc4sm8646031ejn.37.2022.09.01.08.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 08:26:34 -0700 (PDT) From: Ondrej Mosnacek To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, rcu@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Pitt Subject: [PATCH 1/2] fs: convert simple_xattrs to RCU list Date: Thu, 1 Sep 2022 17:26:31 +0200 Message-Id: <20220901152632.970018-2-omosnace@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901152632.970018-1-omosnace@redhat.com> References: <20220901152632.970018-1-omosnace@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the RCU list mechanism instead of a simple lock to access/modify simple_xattrs. The performance benefit is probably negligible, but it will help avoid lock nesting concerns for an upcoming patch. Signed-off-by: Ondrej Mosnacek --- fs/xattr.c | 36 ++++++++++++++++++++++-------------- include/linux/xattr.h | 1 + 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index a1f4998bc6be..fad2344f1168 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include =20 #include =20 @@ -1030,8 +1032,8 @@ int simple_xattr_get(struct simple_xattrs *xattrs, co= nst char *name, struct simple_xattr *xattr; int ret =3D -ENODATA; =20 - spin_lock(&xattrs->lock); - list_for_each_entry(xattr, &xattrs->head, list) { + rcu_read_lock(); + list_for_each_entry_rcu(xattr, &xattrs->head, list) { if (strcmp(name, xattr->name)) continue; =20 @@ -1044,10 +1046,18 @@ int simple_xattr_get(struct simple_xattrs *xattrs, = const char *name, } break; } - spin_unlock(&xattrs->lock); + rcu_read_unlock(); return ret; } =20 +static void simple_xattr_free_rcu(struct rcu_head *rcu) +{ + struct simple_xattr *xattr =3D container_of(rcu, struct simple_xattr, rcu= ); + + kfree(xattr->name); + kvfree(xattr); +} + /** * simple_xattr_set - xattr SET operation for in-memory/pseudo filesystems * @xattrs: target simple_xattr list @@ -1094,11 +1104,11 @@ int simple_xattr_set(struct simple_xattrs *xattrs, = const char *name, xattr =3D new_xattr; err =3D -EEXIST; } else if (new_xattr) { - list_replace(&xattr->list, &new_xattr->list); + list_replace_rcu(&xattr->list, &new_xattr->list); if (removed_size) *removed_size =3D xattr->size; } else { - list_del(&xattr->list); + list_del_rcu(&xattr->list); if (removed_size) *removed_size =3D xattr->size; } @@ -1109,15 +1119,13 @@ int simple_xattr_set(struct simple_xattrs *xattrs, = const char *name, xattr =3D new_xattr; err =3D -ENODATA; } else { - list_add(&new_xattr->list, &xattrs->head); + list_add_rcu(&new_xattr->list, &xattrs->head); xattr =3D NULL; } out: spin_unlock(&xattrs->lock); - if (xattr) { - kfree(xattr->name); - kvfree(xattr); - } + if (xattr) + call_rcu(&xattr->rcu, simple_xattr_free_rcu); return err; =20 } @@ -1169,8 +1177,8 @@ ssize_t simple_xattr_list(struct inode *inode, struct= simple_xattrs *xattrs, } #endif =20 - spin_lock(&xattrs->lock); - list_for_each_entry(xattr, &xattrs->head, list) { + rcu_read_lock(); + list_for_each_entry_rcu(xattr, &xattrs->head, list) { /* skip "trusted." attributes for unprivileged callers */ if (!trusted && xattr_is_trusted(xattr->name)) continue; @@ -1179,7 +1187,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct= simple_xattrs *xattrs, if (err) break; } - spin_unlock(&xattrs->lock); + rcu_read_unlock(); =20 return err ? err : size - remaining_size; } @@ -1191,6 +1199,6 @@ void simple_xattr_list_add(struct simple_xattrs *xatt= rs, struct simple_xattr *new_xattr) { spin_lock(&xattrs->lock); - list_add(&new_xattr->list, &xattrs->head); + list_add_rcu(&new_xattr->list, &xattrs->head); spin_unlock(&xattrs->lock); } diff --git a/include/linux/xattr.h b/include/linux/xattr.h index 979a9d3e5bfb..3236c469aaac 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -86,6 +86,7 @@ struct simple_xattrs { =20 struct simple_xattr { struct list_head list; + struct rcu_head rcu; char *name; size_t size; char value[]; --=20 2.37.2 From nobody Mon Apr 6 21:32:31 2026 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 A2D9DECAAD1 for ; Thu, 1 Sep 2022 15:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234627AbiIAP1T (ORCPT ); Thu, 1 Sep 2022 11:27:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234440AbiIAP0o (ORCPT ); Thu, 1 Sep 2022 11:26:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DE6175CD6 for ; Thu, 1 Sep 2022 08:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662045998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7YMU843VlzNWC/pPcXDFCFCDg71epze0+Cwzb9ajlw=; b=g0g0vDEVHCnSMAYVt8KWC/tJLRLkxFcHwZdx0lfiwPK6uOQFJNtz1TTi8XX6AWIUtatVqt dfgGynX45eHIRVqyM7Ei3CAyxFlrL5uj2bQdcIZcrFuiMAutpybDJuVvZCcuHpVKxcCnnI hXsEu4j9f5t7qYktHobEDRrdEz38bPA= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-16-9EnfU1owNvqSkSwf7KumMg-1; Thu, 01 Sep 2022 11:26:37 -0400 X-MC-Unique: 9EnfU1owNvqSkSwf7KumMg-1 Received: by mail-ed1-f72.google.com with SMTP id b13-20020a056402350d00b0043dfc84c533so11824027edd.5 for ; Thu, 01 Sep 2022 08:26:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=V7YMU843VlzNWC/pPcXDFCFCDg71epze0+Cwzb9ajlw=; b=peAUsTDetrMqWb6+Ld6gmZ1LjRE1TXBPQqZZTcfArdh8iYJhGMr/h+suaHiuEfd2fD QAsQmWHR1R6muoQrgP7N645qnJ0QFvZN7Ys8MMDu4MV3bBNknH1+ZX1n2/rzvStkouDT EtovJFKj99dfpKPjc4xRD5+ZLXObSVvEgD4tn1AGEIOX+oFJFiJfp4AsMXuIH71MNEZP l0zETBPet6Py7uBDToFMUUN7Ehh8dLvAK957LbzdrEn3CQVB4zLLsIKTbUCdBo4Ln6HQ TEwLC7U516N055hALpdJB0e42sj9svbEp8M3c5VnQ7R0uaKXTBgUNf+K8EPUMVV0+8fp FNew== X-Gm-Message-State: ACgBeo31df6qXa4ZsBoEvkdyQfwvYan0VFYhZLZ6moxcXdv9cYUHPxnE bbzKufGj8JOOt/NwEad8VIN5rn+Zs8WjYRZ/RplaICkKK/PRUURT2ZAZwwDR0SP9/HwTm4nGju4 uY1407VmQpVNIFYSuFDueUvp+ X-Received: by 2002:a05:6402:2791:b0:448:763c:666f with SMTP id b17-20020a056402279100b00448763c666fmr16544842ede.36.1662045996600; Thu, 01 Sep 2022 08:26:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR6IWwgCT5rUYou5fGNheuAznqzf2ytt4UDRtNcZDjDbVuQbEp4YWjiAyIYJGVUT6zs409BVUA== X-Received: by 2002:a05:6402:2791:b0:448:763c:666f with SMTP id b17-20020a056402279100b00448763c666fmr16544831ede.36.1662045996400; Thu, 01 Sep 2022 08:26:36 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id o23-20020a170906775700b00730bfe6adc4sm8646031ejn.37.2022.09.01.08.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 08:26:35 -0700 (PDT) From: Ondrej Mosnacek To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, rcu@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Pitt Subject: [PATCH 2/2] fs: don't call capable() prematurely in simple_xattr_list() Date: Thu, 1 Sep 2022 17:26:32 +0200 Message-Id: <20220901152632.970018-3-omosnace@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901152632.970018-1-omosnace@redhat.com> References: <20220901152632.970018-1-omosnace@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Calling capable() pre-emptively causes a problem for SELinux, which will normally log a denial whenever capable() is called and the task's SELinux context doesn't have the corresponding capability permission allowed. With the current implementation of simple_xattr_list(), any time a process without CAP_SYS_ADMIN calls listxattr(2) or similar on a filesystem that uses this function, a denial is logged even if there are no trusted.* xattrs on the inode in question. In such situation, policy writers are forced to chose one of the following options: 1. Grant CAP_SYS_ADMIN to the given SELinux domain even though it doesn't really need it. (Not good for security.) 2. Add a rule to the policy that will silence CAP_SYS_ADMIN denials for the given domain without actually granting it. (Not good, because now denials that make actual difference may be hidden, making troubleshooting harder.) 3. Do nothing and let the denials appear. (Not good, because the audit spam could obscure actual important denials.) To avoid this misery, only call capable() when an actual trusted.* xattr is encountered. This is somewhat less optimal, since capable() will now be called once per each trusted.* xattr, but that's pretty unlikely to matter in practice. Even after this fix any process listing xattrs on an inode that has one or more trusted.* ones may trigger an "irrelevant" denial if it doesn't actually care about the trusted.* xattrs, but such cases should be rare and thus silencing the denial in such cases would not be as big of a deal. Fixes: b09e0fa4b4ea ("tmpfs: implement generic xattr support") Reported-by: Martin Pitt Signed-off-by: Ondrej Mosnacek --- fs/xattr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index fad2344f1168..84a459ac779a 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -1155,7 +1155,6 @@ static int xattr_list_one(char **buffer, ssize_t *rem= aining_size, ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattr= s, char *buffer, size_t size) { - bool trusted =3D capable(CAP_SYS_ADMIN); struct simple_xattr *xattr; ssize_t remaining_size =3D size; int err =3D 0; @@ -1180,7 +1179,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct= simple_xattrs *xattrs, rcu_read_lock(); list_for_each_entry_rcu(xattr, &xattrs->head, list) { /* skip "trusted." attributes for unprivileged callers */ - if (!trusted && xattr_is_trusted(xattr->name)) + if (xattr_is_trusted(xattr->name) && !capable(CAP_SYS_ADMIN)) continue; =20 err =3D xattr_list_one(&buffer, &remaining_size, xattr->name); --=20 2.37.2