Skip to content

Commit 2ddd3ca

Browse files
ereshetovakees
authored andcommitted
nsproxy: Convert nsproxy.count to refcount_t
atomic_t variables are currently used to implement reference counters with the following properties: - counter is initialized to 1 using atomic_set() - a resource is freed upon counter reaching zero - once counter reaches zero, its further increments aren't allowed - counter schema uses basic atomic operations (set, inc, inc_not_zero, dec_and_test, etc.) Such atomic variables should be converted to a newly provided refcount_t type and API that prevents accidental counter overflows and underflows. This is important since overflows and underflows can lead to use-after-free situation and be exploitable. The variable nsproxy.count is used as pure reference counter. Convert it to refcount_t and fix up the operations. **Important note for maintainers: Some functions from refcount_t API defined in refcount.h have different memory ordering guarantees than their atomic counterparts. Please check Documentation/core-api/refcount-vs-atomic.rst for more information. Normally the differences should not matter since refcount_t provides enough guarantees to satisfy the refcounting use cases, but in some rare cases it might matter. Please double check that you don't have some undocumented memory guarantees for this variable usage. For the nsproxy.count it might make a difference in following places: - put_nsproxy() and switch_task_namespaces(): decrement in refcount_dec_and_test() only provides RELEASE ordering and ACQUIRE ordering on success vs. fully ordered atomic counterpart Suggested-by: Kees Cook <keescook@chromium.org> Signed-off-by: Elena Reshetova <elena.reshetova@intel.com> Reviewed-by: David Windsor <dwindsor@gmail.com> Reviewed-by: Hans Liljestrand <ishkamiel@gmail.com> Reviewed-by: Christian Brauner <brauner@kernel.org> Link: https://lore.kernel.org/r/20230818041327.gonna.210-kees@kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent a4b35d4 commit 2ddd3ca

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

include/linux/nsproxy.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct fs_struct;
2929
* nsproxy is copied.
3030
*/
3131
struct nsproxy {
32-
atomic_t count;
32+
refcount_t count;
3333
struct uts_namespace *uts_ns;
3434
struct ipc_namespace *ipc_ns;
3535
struct mnt_namespace *mnt_ns;
@@ -102,14 +102,13 @@ int __init nsproxy_cache_init(void);
102102

103103
static inline void put_nsproxy(struct nsproxy *ns)
104104
{
105-
if (atomic_dec_and_test(&ns->count)) {
105+
if (refcount_dec_and_test(&ns->count))
106106
free_nsproxy(ns);
107-
}
108107
}
109108

110109
static inline void get_nsproxy(struct nsproxy *ns)
111110
{
112-
atomic_inc(&ns->count);
111+
refcount_inc(&ns->count);
113112
}
114113

115114
#endif

kernel/nsproxy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
static struct kmem_cache *nsproxy_cachep;
3131

3232
struct nsproxy init_nsproxy = {
33-
.count = ATOMIC_INIT(1),
33+
.count = REFCOUNT_INIT(1),
3434
.uts_ns = &init_uts_ns,
3535
#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
3636
.ipc_ns = &init_ipc_ns,
@@ -55,7 +55,7 @@ static inline struct nsproxy *create_nsproxy(void)
5555

5656
nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
5757
if (nsproxy)
58-
atomic_set(&nsproxy->count, 1);
58+
refcount_set(&nsproxy->count, 1);
5959
return nsproxy;
6060
}
6161

0 commit comments

Comments
 (0)