mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increase size of ucounts to atomic_long_t

Browse source 
RLIMIT_MSGQUEUE and RLIMIT_MEMLOCK use unsigned long to store their
counters. As a preparation for moving rlimits based on ucounts, we need
to increase the size of the variable to long.

Signed-off-by: Alexey Gladkov <legion@kernel.org>
Link: https://lkml.kernel.org/r/257aa5fb1a7d81cf0f4c34f39ada2320c4284771.1619094428.git.legion@kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Alexey Gladkov 2021-04-22 14:27:08 +02:00 committed by Eric W. Biederman
parent 9f4ad9e425
commit f9c82a4ea8
2 changed files with 10 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/user_namespace.h
View file

@ -88,7 +88,7 @@ struct user_namespace {
struct ctl_table_header *sysctls; struct ctl_table_header *sysctls;
#endif #endif
struct ucounts *ucounts; struct ucounts *ucounts;
int ucount_max[UCOUNT_COUNTS]; long ucount_max[UCOUNT_COUNTS];
} __randomize_layout; } __randomize_layout;
struct ucounts { struct ucounts {
@ -96,7 +96,7 @@ struct ucounts {
struct user_namespace *ns; struct user_namespace *ns;
kuid_t uid; kuid_t uid;
int count; int count;
atomic_t ucount[UCOUNT_COUNTS]; atomic_long_t ucount[UCOUNT_COUNTS];
}; };
extern struct user_namespace init_user_ns; extern struct user_namespace init_user_ns;

16
kernel/ucount.c
View file

@ -175,14 +175,14 @@ static void put_ucounts(struct ucounts *ucounts)
kfree(ucounts); kfree(ucounts);
} }
static inline bool atomic_inc_below(atomic_t *v, int u) static inline bool atomic_long_inc_below(atomic_long_t *v, int u)
{ {
int c, old; long c, old;
c = atomic_read(v); c = atomic_long_read(v);
for (;;) { for (;;) {
if (unlikely(c >= u)) if (unlikely(c >= u))
return false; return false;
old = atomic_cmpxchg(v, c, c+1); old = atomic_long_cmpxchg(v, c, c+1);
if (likely(old == c)) if (likely(old == c))
return true; return true;
c = old; c = old;
@ -196,17 +196,17 @@ struct ucounts *inc_ucount(struct user_namespace *ns, kuid_t uid,
struct user_namespace *tns; struct user_namespace *tns;
ucounts = get_ucounts(ns, uid); ucounts = get_ucounts(ns, uid);
for (iter = ucounts; iter; iter = tns->ucounts) { for (iter = ucounts; iter; iter = tns->ucounts) {
int max; long max;
tns = iter->ns; tns = iter->ns;
max = READ_ONCE(tns->ucount_max[type]); max = READ_ONCE(tns->ucount_max[type]);
if (!atomic_inc_below(&iter->ucount[type], max)) if (!atomic_long_inc_below(&iter->ucount[type], max))
goto fail; goto fail;
} }
return ucounts; return ucounts;
fail: fail:
bad = iter; bad = iter;
for (iter = ucounts; iter != bad; iter = iter->ns->ucounts) for (iter = ucounts; iter != bad; iter = iter->ns->ucounts)
atomic_dec(&iter->ucount[type]); atomic_long_dec(&iter->ucount[type]);
put_ucounts(ucounts); put_ucounts(ucounts);
return NULL; return NULL;
@ -216,7 +216,7 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type)
{ {
struct ucounts *iter; struct ucounts *iter;
for (iter = ucounts; iter; iter = iter->ns->ucounts) { for (iter = ucounts; iter; iter = iter->ns->ucounts) {
int dec = atomic_dec_if_positive(&iter->ucount[type]); long dec = atomic_long_dec_if_positive(&iter->ucount[type]);
WARN_ON_ONCE(dec < 0); WARN_ON_ONCE(dec < 0);
} }
put_ucounts(ucounts); put_ucounts(ucounts);