Move *_ucounts functions above
PATCH v3 1/3 Move *_ucounts functions above
So we can use them from proc_handler functions in user_table
--- kernel/ucount.c | 122 ++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 61 deletions(-)
kernel/ucount.c +61 -61
@@ -57,6 +57,67 @@ static struct ctl_table_root set_root = { .permissions = set_permissions, }; +static struct ucounts *find_ucounts (struct user_namespace *ns,kuid_t uid,struct hlist_head *hashent) +{ +struct ucounts *ucounts; + +hlist_for_each_entry (ucounts, hashent, node) { +if (uid_eq (ucounts->uid, uid) && (ucounts->ns == ns)) +return ucounts; + } +return NULL ; +} + +static struct ucounts *get_ucounts (struct user_namespace *ns,kuid_t uid) +{ +struct hlist_head *hashent =ucounts_hashentry (ns, uid); +struct ucounts *ucounts, *new; + +spin_lock_irq (&ucounts_lock); + ucounts =find_ucounts (ns, uid, hashent); +if (!ucounts) { +spin_unlock_irq (&ucounts_lock); + + new =kzalloc (sizeof (*new),GFP_KERNEL ); +if (!new) +return NULL ; + + new->ns = ns; + new->uid = uid; + new->count =0 ; + +spin_lock_irq (&ucounts_lock); + ucounts =find_ucounts (ns, uid, hashent); +if (ucounts) { +kfree (new); + }else { +hlist_add_head (&new->node, hashent); + ucounts = new; + } + } +if (ucounts->count ==INT_MAX ) + ucounts =NULL ; +else + ucounts->count +=1 ; +spin_unlock_irq (&ucounts_lock); +return ucounts; +} + +static void put_ucounts (struct ucounts *ucounts) +{ +unsigned long flags; + +spin_lock_irqsave (&ucounts_lock, flags); + ucounts->count -=1 ; +if (!ucounts->count) +hlist_del_init (&ucounts->node); +else + ucounts =NULL ; +spin_unlock_irqrestore (&ucounts_lock, flags); + +kfree (ucounts); +} +static int zero =0 ;static int int_max =INT_MAX ;#define UCOUNT_ENTRY (name) \
@@ -118,67 +179,6 @@ void retire_userns_sysctls(struct user_namespace *ns)#endif } -static struct ucounts *find_ucounts (struct user_namespace *ns,kuid_t uid,struct hlist_head *hashent) -{ -struct ucounts *ucounts; - -hlist_for_each_entry (ucounts, hashent, node) { -if (uid_eq (ucounts->uid, uid) && (ucounts->ns == ns)) -return ucounts; - } -return NULL ; -} - -static struct ucounts *get_ucounts (struct user_namespace *ns,kuid_t uid) -{ -struct hlist_head *hashent =ucounts_hashentry (ns, uid); -struct ucounts *ucounts, *new; - -spin_lock_irq (&ucounts_lock); - ucounts =find_ucounts (ns, uid, hashent); -if (!ucounts) { -spin_unlock_irq (&ucounts_lock); - - new =kzalloc (sizeof (*new),GFP_KERNEL ); -if (!new) -return NULL ; - - new->ns = ns; - new->uid = uid; - new->count =0 ; - -spin_lock_irq (&ucounts_lock); - ucounts =find_ucounts (ns, uid, hashent); -if (ucounts) { -kfree (new); - }else { -hlist_add_head (&new->node, hashent); - ucounts = new; - } - } -if (ucounts->count ==INT_MAX ) - ucounts =NULL ; -else - ucounts->count +=1 ; -spin_unlock_irq (&ucounts_lock); -return ucounts; -} - -static void put_ucounts (struct ucounts *ucounts) -{ -unsigned long flags; - -spin_lock_irqsave (&ucounts_lock, flags); - ucounts->count -=1 ; -if (!ucounts->count) -hlist_del_init (&ucounts->node); -else - ucounts =NULL ; -spin_unlock_irqrestore (&ucounts_lock, flags); - -kfree (ucounts); -} -static inline bool atomic_inc_below (atomic_t *v,int u) {int c, old;
Signature · 1 line
2.21.0
PATCH v3 2/3 kernel/ucounts: expose count of inotify watches in use
Adds a readonly 'current_inotify_watches' entry to the user sysctl table. The handler for this entry is a custom function that ends up calling proc_dointvec. Said sysctl table already contains 'max_inotify_watches' and it gets mounted under /proc/sys/user/.
Inotify watches are a finite resource, in a similar way to available file descriptors. The motivation for this patch is to be able to set up monitoring and alerting before an application starts failing because it runs out of inotify watches.
--- kernel/ucount.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
kernel/ucount.c +26 -0
@@ -118,6 +118,26 @@ static void put_ucounts(struct ucounts *ucounts)kfree (ucounts); } +#ifdef CONFIG_INOTIFY_USER +int proc_read_inotify_watches (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +struct ucounts *ucounts; +struct ctl_table fake_table; +int count =-1 ; + + ucounts =get_ucounts (current_user_ns (),current_euid ()); +if (ucounts !=NULL ) { + count =atomic_read (&ucounts->ucount[UCOUNT_INOTIFY_WATCHES ]); +put_ucounts (ucounts); + } + + fake_table.data = &count; + fake_table.maxlen =sizeof (count); +return proc_dointvec (&fake_table, write, buffer, lenp, ppos); +} +#endif +static int zero =0 ;static int int_max =INT_MAX ;#define UCOUNT_ENTRY (name) \
@@ -140,6 +160,12 @@ static struct ctl_table user_table[] = {#ifdef CONFIG_INOTIFY_USER UCOUNT_ENTRY ("max_inotify_instances" ), UCOUNT_ENTRY("max_inotify_watches"), + { + .procname ="current_inotify_watches" , + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = proc_read_inotify_watches, + }, #endif { } };
Signature · 1 line
2.21.0
Re: [PATCH v3 2/3] kernel/ucounts: expose count of inotify watches in use
Quoted 15 lines · On Fri, 31 May 2019 21:50:15 +0200 Albert Vaca Cintora <[email protected]>…
Adds a readonly '
current_inotify_watches' entry to the user sysctl table. The handler for this entry is a custom function that ends up callingproc_dointvec. Said sysctl table already contains 'max_inotify_watches' and it gets mounted under/proc/sys/user/.Inotify watches are a finite resource, in a similar way to available file descriptors. The motivation for this patch is to be able to set up monitoring and alerting before an application starts failing because it runs out of inotify watches.
...
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 126
Quoted 9 lines
kernel/ucount.c +6
-0@@ -118,6 +118,26 @@ static void put_ucounts(struct ucounts *ucounts)kfree (ucounts); } +#ifdef CONFIG_INOTIFY_USER +int proc_read_inotify_watches (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +struct ucounts *ucounts; +struct ctl_table fake_table;
hmm.
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 137
Quoted 11 lines
kernel/ucount.c +11
-0+int count =-1 ; + + ucounts =get_ucounts (current_user_ns (),current_euid ()); +if (ucounts !=NULL ) { + count =atomic_read (&ucounts->ucount[UCOUNT_INOTIFY_WATCHES ]); +put_ucounts (ucounts); + } + + fake_table.data = &count; + fake_table.maxlen =sizeof (count); +return proc_dointvec (&fake_table, write, buffer, lenp, ppos);
proc_dointvec
->do_proc_dointvec
->__do_proc_dointvec
->proc_first_pos_non_zero_ignore
->warn_sysctl_write
->pr_warn_once(..., table->procname)and I think ->procname is uninitialized.
That's from a cursory check. Perhaps other uninitialized members of fake_table are accessed, dunno.
we could do
{
struct ctl_table fake_table = {
.data = &count,
.maxlen = sizeof(count),
};
return proc_dointvec(&fake_table, write, buffer, lenp, ppos);
}or whatever. That will cause the pr_warn_once to print "(null)" but that's OK I guess.
Are there other places in the kernel which do this temp ctl_table trick? If so, what do they do? If not, what is special about this code?
Re: [PATCH v3 2/3] kernel/ucounts: expose count of inotify watches in use
Quoted 65 lines · Andrew Morton
Quoted 15 lines · On Fri, 31 May 2019 21:50:15 +0200 Albert Vaca Cintora <[email protected]>…
Adds a readonly '
current_inotify_watches' entry to the user sysctl table. The handler for this entry is a custom function that ends up callingproc_dointvec. Said sysctl table already contains 'max_inotify_watches' and it gets mounted under/proc/sys/user/.Inotify watches are a finite resource, in a similar way to available file descriptors. The motivation for this patch is to be able to set up monitoring and alerting before an application starts failing because it runs out of inotify watches.
...
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 126
Quoted 9 lines
kernel/ucount.c +6
-0@@ -118,6 +118,26 @@ static void put_ucounts(struct ucounts *ucounts)kfree (ucounts); } +#ifdef CONFIG_INOTIFY_USER +int proc_read_inotify_watches (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +struct ucounts *ucounts; +struct ctl_table fake_table;hmm.
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 137
Quoted 11 lines
kernel/ucount.c +11
-0+int count =-1 ; + + ucounts =get_ucounts (current_user_ns (),current_euid ()); +if (ucounts !=NULL ) { + count =atomic_read (&ucounts->ucount[UCOUNT_INOTIFY_WATCHES ]); +put_ucounts (ucounts); + } + + fake_table.data = &count; + fake_table.maxlen =sizeof (count); +return proc_dointvec (&fake_table, write, buffer, lenp, ppos);
proc_dointvec
->do_proc_dointvec
->__do_proc_dointvec->proc_first_pos_non_zero_ignore ->warn_sysctl_write ->pr_warn_once(..., table->procname)and I think ->procname is uninitialized.
That's from a cursory check. Perhaps other uninitialized members of
fake_tableare accessed, dunno.we could do
{ struct ctl_table fake_table = { .data = &count, .maxlen = sizeof(count), }; return proc_dointvec(&fake_table, write, buffer, lenp, ppos); }
Quoted 8 lines
or whatever. That will cause the
pr_warn_onceto print "(null)" but that's OK I guess.Are there other places in the kernel which do this temp
ctl_tabletrick? If so, what do they do? If not, what is special about this code?
I copied this 'fake_table' trick from proc_do_entropy in drivers/char/random.c exactly as it is. It is also used in other places with slight variations.
Note that, since we are creating a read-only proc file, proc_first_pos_non_zero_ignore is not called from __do_proc_dointvec, so the uninitialized ->procname is not accessed.
Albert
Re: [PATCH v3 2/3] kernel/ucounts: expose count of inotify watches in use
Quoted 76 lines · Albert Vaca Cintora
Quoted 65 lines · Andrew Morton
Quoted 15 lines · On Fri, 31 May 2019 21:50:15 +0200 Albert Vaca Cintora <[email protected]>…
Adds a readonly '
current_inotify_watches' entry to the user sysctl table. The handler for this entry is a custom function that ends up callingproc_dointvec. Said sysctl table already contains 'max_inotify_watches' and it gets mounted under/proc/sys/user/.Inotify watches are a finite resource, in a similar way to available file descriptors. The motivation for this patch is to be able to set up monitoring and alerting before an application starts failing because it runs out of inotify watches.
...
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 126
Quoted 9 lines
kernel/ucount.c +6
-0@@ -118,6 +118,26 @@ static void put_ucounts(struct ucounts *ucounts)kfree (ucounts); } +#ifdef CONFIG_INOTIFY_USER +int proc_read_inotify_watches (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +struct ucounts *ucounts; +struct ctl_table fake_table;hmm.
kernel/ucount.c static void put_ucounts(struct ucounts *ucounts) · line 137
Quoted 11 lines
kernel/ucount.c +11
-0+int count =-1 ; + + ucounts =get_ucounts (current_user_ns (),current_euid ()); +if (ucounts !=NULL ) { + count =atomic_read (&ucounts->ucount[UCOUNT_INOTIFY_WATCHES ]); +put_ucounts (ucounts); + } + + fake_table.data = &count; + fake_table.maxlen =sizeof (count); +return proc_dointvec (&fake_table, write, buffer, lenp, ppos);
proc_dointvec
->do_proc_dointvec
->__do_proc_dointvec->proc_first_pos_non_zero_ignore ->warn_sysctl_write ->pr_warn_once(..., table->procname)and I think ->procname is uninitialized.
That's from a cursory check. Perhaps other uninitialized members of
fake_tableare accessed, dunno.we could do
{ struct ctl_table fake_table = { .data = &count, .maxlen = sizeof(count), }; return proc_dointvec(&fake_table, write, buffer, lenp, ppos); }Quoted 8 lines
or whatever. That will cause the
pr_warn_onceto print "(null)" but that's OK I guess.Are there other places in the kernel which do this temp
ctl_tabletrick? If so, what do they do? If not, what is special about this code?
Quoted 8 lines
I copied this '
fake_table' trick fromproc_do_entropyindrivers/char/random.cexactly as it is. It is also used in other places with slight variations.Note that, since we are creating a read-only proc file,
proc_first_pos_non_zero_ignoreis not called from__do_proc_dointvec, so the uninitialized ->procname is not accessed.
Friendly ping. I think the code is correct as it is for the reasons explained above.
Best regards,
Albert
PATCH v3 3/3 Documentation for /proc/sys/user/*_inotify_*
In reply to Albert Vaca CintoraAdded docs for the existing and new inotify-related files
--- Documentation/sysctl/user.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/sysctl/user.txt +15 -0
@@ -30,11 +30,26 @@ user namespace does not allow a user to escape their current limits. Currently, these files are in /proc/sys/user: +- current_inotify_watches + + The number of inotify watches in use in the current user namespace. + Calling inotify_add_watch() increases this. + - max_cgroup_namespaces The maximum number of cgroup namespaces that any user in the current user namespace may create. +- max_inotify_instances + + The maximum number of inotify instances that any user in the current + user namespace may create. Calling inotify_init() uses an instance. + +- max_inotify_watches + + The maximum number of inotify watches that any user in the current + user namespace may create. Calling inotify_add_watch() uses a watch. + - max_ipc_namespaces The maximum number of ipc namespaces that any user in the current
Signature · 1 line
2.21.0