leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ucounts: add missing data type changes

Browse Source 
commit f9c82a4ea8 ("Increase size of ucounts to atomic_long_t")
changed the data type of ucounts/ucounts_max to long, but missed to
adjust a few other places. This is noticeable on big endian platforms
from user space because the /proc/sys/user/max_*_names files all
contain 0.

v4 - Made the min and max constants long so the sysctl values
     are actually settable on little endian machines.
     -- EWB

Fixes: f9c82a4ea8 ("Increase size of ucounts to atomic_long_t")
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Acked-by: Alexey Gladkov <legion@kernel.org>
v1: https://lkml.kernel.org/r/20210721115800.910778-1-svens@linux.ibm.com
v2: https://lkml.kernel.org/r/20210721125233.1041429-1-svens@linux.ibm.com
v3: https://lkml.kernel.org/r/20210730062854.3601635-1-svens@linux.ibm.com
Link: https://lkml.kernel.org/r/8735rijqlv.fsf_-_@disp2133
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Sven Schnelle
2021-07-30 08:28:54 +02:00
committed by Eric W. Biederman
parent 345daff2e9
commit f153c22467
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/notify/fanotify/fanotify_user.c
View File

@@ -54,22 +54,27 @@ static int fanotify_max_queued_events __read_mostly;
#include <linux/sysctl.h> #include <linux/sysctl.h>
static long ft_zero = 0;
static long ft_int_max = INT_MAX;
struct ctl_table fanotify_table[] = { struct ctl_table fanotify_table[] = {
{ {
.procname = "max_user_groups", .procname = "max_user_groups",
.data = &init_user_ns.ucount_max[UCOUNT_FANOTIFY_GROUPS], .data = &init_user_ns.ucount_max[UCOUNT_FANOTIFY_GROUPS],
.maxlen = sizeof(int), .maxlen = sizeof(long),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = SYSCTL_ZERO, .extra1 = &ft_zero,
.extra2 = &ft_int_max,
}, },
{ {
.procname = "max_user_marks", .procname = "max_user_marks",
.data = &init_user_ns.ucount_max[UCOUNT_FANOTIFY_MARKS], .data = &init_user_ns.ucount_max[UCOUNT_FANOTIFY_MARKS],
.maxlen = sizeof(int), .maxlen = sizeof(long),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = SYSCTL_ZERO, .extra1 = &ft_zero,
.extra2 = &ft_int_max,
}, },
{ {
.procname = "max_queued_events", .procname = "max_queued_events",

17
fs/notify/inotify/inotify_user.c
View File

@@ -55,22 +55,27 @@ struct kmem_cache *inotify_inode_mark_cachep __read_mostly;
#include <linux/sysctl.h> #include <linux/sysctl.h>
static long it_zero = 0;
static long it_int_max = INT_MAX;
struct ctl_table inotify_table[] = { struct ctl_table inotify_table[] = {
{ {
.procname = "max_user_instances", .procname = "max_user_instances",
.data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES], .data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],
.maxlen = sizeof(int), .maxlen = sizeof(long),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = SYSCTL_ZERO, .extra1 = &it_zero,
.extra2 = &it_int_max,
}, },
{ {
.procname = "max_user_watches", .procname = "max_user_watches",
.data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES], .data = &init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES],
.maxlen = sizeof(int), .maxlen = sizeof(long),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_doulongvec_minmax,
.extra1 = SYSCTL_ZERO, .extra1 = &it_zero,
.extra2 = &it_int_max,
}, },
{ {
.procname = "max_queued_events", .procname = "max_queued_events",

19
kernel/ucount.c
View File

@@ -58,14 +58,17 @@ static struct ctl_table_root set_root = {
.permissions = set_permissions, .permissions = set_permissions,
}; };
#define UCOUNT_ENTRY(name) \ static long ue_zero = 0;
{ \ static long ue_int_max = INT_MAX;
.procname = name, \
.maxlen = sizeof(int), \ #define UCOUNT_ENTRY(name) \
.mode = 0644, \ { \
.proc_handler = proc_dointvec_minmax, \ .procname = name, \
.extra1 = SYSCTL_ZERO, \ .maxlen = sizeof(long), \
.extra2 = SYSCTL_INT_MAX, \ .mode = 0644, \
.proc_handler = proc_doulongvec_minmax, \
.extra1 = &ue_zero, \
.extra2 = &ue_int_max, \
} }
static struct ctl_table user_table[] = { static struct ctl_table user_table[] = {
UCOUNT_ENTRY("max_user_namespaces"), UCOUNT_ENTRY("max_user_namespaces"),