From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 A7B2B3B14AB for ; Wed, 9 Sep 2026 19:38:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788982704; cv=none; b=FogjlfiXPBdphVRSJ1KltwJkIcMuQxdzX5Q/fSKCqDK/trWqLLrJT2+n9u7XtPk+XDAKdRYPnkAl1RHl+JJaNDLnKj1BS1BU6nR0n72lTuHSb7+sYhpSs+5c/I0+vex+3PkPfZqsVuglkSpQhfQj5kh1CnmkoOi9hGlVQ/gIjNI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788982704; c=relaxed/simple; bh=lZBPKN9tIckw18hI3pUXLnkD8axvL7yGCPUsmHMAcok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=epa6EkBZw29NXDHyhsHfoOVRW3/N/8XV6KZp6bwgVSUrDj5ubYASN6Es4A1Dc5zicVkhG9Ti5GKgt9S/Rp72yI78UL2XtyZH+DnXmXA3YwbNcrnIn/ZZhQ86mmEo/IEBw87z+uo/YFIjNrki+E8UC9PJeUMektXAJxb9GhBkII4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K90a1jZw; arc=none smtp.client-ip=209.85.128.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K90a1jZw" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-86d43cdee51so80495887b3.2 for ; Wed, 09 Sep 2026 12:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788982700; x=1789587500; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=6LXObdENkcO6lDYtxSgA/vA2hc5vAc6IcovovYK/Cr4=; b=K90a1jZwUx1X0o+np8ih7KyaX4bQp4Gn+IC+5AU+2tOwsUiWPNoREutI1UKRVMrkBr Txc0x9QuMifJYuTvMEgbiOaL9NYN+yGz/eFBg7tExxdhXUpfHZ+ltfr4Xqh+9eQClo0K ksiGZU7F/mDHm4nEG6Y/iG6Bu9dk8KgqXF7Ny4jlgYLT+K+ro5l9bUJUrLnymgIpqmLX V91Nykh6zqLu9EbMxR2LBlmUxSqGn5JlbR+Hpvcak+AOEPqH9RgHHGw8IffeVlFnBMKz vG2WJGTW1dKLkqnHsZ5vCmslqVXx01dfhimvs0A+I3P+Sb9e5VNQJVbN0rjuVlrBSafQ h05A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788982700; x=1789587500; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6LXObdENkcO6lDYtxSgA/vA2hc5vAc6IcovovYK/Cr4=; b=A4U0kouZdHJXeZ1447aoWk+L5W/gRPHH99MI3tizRF3Yn69ILVb327XfWSizqL1+nM VxrDrJpoBF4k/ILfoy4m0YNy52LNXOoKnyj/W0WgGJ+ctwL62Sd/V0g6GhMqtRT6SZxe d3f6f2psXzonpzQNekhCVytEH9TSkuqJLwFNmSwhb9UTqD25h6oljjMRfazpwYph9wKI fFHg0rkZN9da7ONajHjvoc7P6BRDoGC/PJBjHB9/TBFG0HK6htiOTGqPl2840es/qmx4 BoWST7JSu06xoQ6x2WBHFvRaaHYlgfv/eyOIjuSdT2UfNvuMrX+jf8Z9QisnCAkgxjUc ovwQ== X-Forwarded-Encrypted: i=1; AKwUvBxZ/EwIFBhDHllgfvw/qHR1L1fsm3lYvlDGzb5EyGCZeLYSUGuuqSOuz4mNiwiMOmGCXG4=@vger.kernel.org X-Gm-Message-State: AFuF++lD0+Ga5FpkX+Tp2eOeBj/0VCjDLkb4CbVa/scvhTCrqbpLs5gJ Fx5Av96NVn713PGrKTa+wjv8bN5OB8xW8//P8z8AHFsLudrvWOiXeSO8 X-Gm-Gg: AYBFou0VIkJ05AQRDDZBp+P2JR7SjZSSkmegkzfU3sjRLOCMid2v1b/0nJRb+dzKK8s gNKFE5UPXeNTWvlcSUnGB6VnxOy7DfiXI+3PfIv9WU77fRbe5clkkuGepJRLz0pG3wNr8pde+yz JXnfu9v24ePYDnXxzwOj3xGE/rKyFv4bbvi673uRFqCxtTOltkGUl5f/Hoz9aOYwJfUk4XeOP8Q Xa0apHSSCYDC7StwfZuhrLtXX1PYxbhHkSoSe33f7KprgwCrPQisJQXK8GJNCSuZ13KNjS/50B/ G/JUKPu0XnGIGGV1L0f+2l7Zp991meXq4H3ApLi1YtClv2uzq8awpUEBMxW+s8gUDo1P2q6L3b2 TyvD0loZtxM0DzvKTJ9nBhZX1SSsIInuBPv1qQMo7hplIGmkDbRd9gBGLd/7b+R7/Ww2E4kCD7i 3t/pXgwKu19Pu1noRL6+tdEJnc4lRpx6qyE7oxHoOvQUNTV5x7FOsztSEOdmwLbvdoCBSsSWAmU L9BjCJgTypoRBxPlKOWMBZVphz5oaA9QE0aSBtEFgk= X-Received: by 2002:a05:690c:288:b0:87e:2480:df7e with SMTP id 00721157ae682-87e2480e524mr54158337b3.49.1788982700039; Wed, 09 Sep 2026 12:38:20 -0700 (PDT) Received: from zenbox ([2600:1700:18fb:6011:bae:bfc2:7e96:e5c8]) by smtp.gmail.com with ESMTPSA id 00721157ae682-871493155d3sm115277577b3.16.2026.09.09.12.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 12:38:19 -0700 (PDT) From: Justin Suess To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, matt@bobrowski.net, paul@paul-moore.com, mic@digikod.net, viro@zeniv.linux.org.uk, brauner@kernel.org, kees@kernel.org Cc: casey@schaufler-ca.com, gnoack@google.com, jack@suse.cz, song@kernel.org, yonghong.song@linux.dev, martin.lau@linux.dev, eddyz87@gmail.com, memxor@gmail.com, jolsa@kernel.org, m@maowtm.org, bpf@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Justin Suess Subject: [PATCH bpf-next v3 12/15] landlock: Free rulesets after an RCU grace period Date: Wed, 9 Sep 2026 15:37:15 -0400 Message-ID: <20260909193719.518517-13-utilityemal77@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909193719.518517-1-utilityemal77@gmail.com> References: <20260909193719.518517-1-utilityemal77@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Defer every ruleset free behind an RCU grace period, and keep the fields that stay readable while a free is pending out of the union that overlays the deferred-free work item. The policy_object_get LSM hook lets a caller holding only an RCU-protected pointer to a ruleset (e.g. loaded from a BPF map kptr field under rcu_read_lock()) race a refcount_inc_not_zero() against the drop of the last reference. For that to be sound, the ruleset's memory, and its reference count in particular, must remain valid until every RCU reader that could still observe the pointer is done: free the ruleset through queue_rcu_work(), which waits for a grace period before running the free work. The work item is overlaid with the fields that no one may touch once @usage reaches zero: @lock, @quiet_masks and @handled_masks. @usage itself stays outside the union so a racing reader observes zero instead of the work item's bytes, and the tracing fields @version and @id stay outside too because the landlock_free_ruleset trace event reads them when the queued work finally runs. Since queueing the work never sleeps, the might_sleep() annotation is dropped: a following commit releases ruleset references from BPF object destructors that cannot sleep. Cc: Mickaël Salaün Signed-off-by: Justin Suess --- Notes: v2->v3: - No change. security/landlock/ruleset.c | 24 ++++++++++++++--- security/landlock/ruleset.h | 54 ++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/security/landlock/ruleset.c b/security/landlock/ruleset.c index 0d07707523cd..00a6b9938fd1 100644 --- a/security/landlock/ruleset.c +++ b/security/landlock/ruleset.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "access.h" @@ -346,9 +347,26 @@ static void free_ruleset(struct landlock_ruleset *const ruleset) kfree(ruleset); } +static void free_ruleset_work(struct work_struct *const work) +{ + struct landlock_ruleset *ruleset; + + ruleset = container_of(to_rcu_work(work), struct landlock_ruleset, + work_free); + free_ruleset(ruleset); +} + +/* + * RCU readers (cf. the policy_object_get LSM hook) may call + * refcount_inc_not_zero() on a ruleset they hold no reference to: the memory + * must survive a grace period after the last put. Queueing the free also + * makes this callable from contexts that cannot sleep (cf. the + * policy_object_put LSM hook). + */ void landlock_put_ruleset(struct landlock_ruleset *const ruleset) { - might_sleep(); - if (ruleset && refcount_dec_and_test(&ruleset->usage)) - free_ruleset(ruleset); + if (ruleset && refcount_dec_and_test(&ruleset->usage)) { + INIT_RCU_WORK(&ruleset->work_free, free_ruleset_work); + queue_rcu_work(system_dfl_wq, &ruleset->work_free); + } } diff --git a/security/landlock/ruleset.h b/security/landlock/ruleset.h index b58e3d9846af..1465f8a5c464 100644 --- a/security/landlock/ruleset.h +++ b/security/landlock/ruleset.h @@ -15,6 +15,7 @@ #include #include #include +#include #include "access.h" #include "limits.h" @@ -157,12 +158,10 @@ struct landlock_ruleset { */ struct landlock_rules rules; /** - * @lock: Protects against concurrent modifications of @rules, if @usage - * is greater than zero. - */ - struct mutex lock; - /** - * @usage: Number of file descriptors referencing this ruleset. + * @usage: Number of file descriptors referencing this ruleset. Kept + * outside the union with @work_free: RCU readers may still call + * refcount_inc_not_zero() while a queued free waits out the grace + * period. */ refcount_t usage; @@ -175,22 +174,41 @@ struct landlock_ruleset { */ u32 version; /** - * @id: Unique identifier for this ruleset, used for tracing. + * @id: Unique identifier for this ruleset, used for tracing. Kept + * outside the union with @work_free: the free_ruleset trace event + * reads it after the free has been queued. */ u64 id; #endif /* CONFIG_TRACEPOINTS */ - /** - * @quiet_masks: Stores the quiet flags for an unmerged ruleset. For a - * merged domain, this is stored in each layer's struct - * landlock_hierarchy instead. - */ - struct access_masks quiet_masks; - /** - * @handled_masks: Contains the subset of filesystem and network actions - * that are handled by this ruleset. - */ - struct access_masks handled_masks; + union { + /** + * @work_free: Enables to free a ruleset after an RCU grace + * period, within a lockless section. This is queued by + * landlock_put_ruleset() when @usage reaches zero. The + * fields @lock, @quiet_masks and @handled_masks are then + * unused. + */ + struct rcu_work work_free; + struct { + /** + * @lock: Protects against concurrent modifications of + * @rules, if @usage is greater than zero. + */ + struct mutex lock; + /** + * @quiet_masks: Stores the quiet flags for an unmerged + * ruleset. For a merged domain, this is stored in each + * layer's struct landlock_hierarchy instead. + */ + struct access_masks quiet_masks; + /** + * @handled_masks: Contains the subset of filesystem and + * network actions that are handled by this ruleset. + */ + struct access_masks handled_masks; + }; + }; }; struct landlock_ruleset * -- 2.55.0