Commit f153c224 authored by Sven Schnelle's avatar Sven Schnelle Committed by Eric W. Biederman
Browse files

ucounts: add missing data type changes 



commit f9c82a4e ("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: f9c82a4e ("Increase size of ucounts to atomic_long_t")
Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Tested-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Acked-by: default avatarAlexey 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: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 345daff2

fs/notify/fanotify/fanotify_user.c

+11 −6
Original line number Diff line number Diff line
@@ -54,22 +54,27 @@ static int fanotify_max_queued_events __read_mostly; 


#include <linux/sysctl.h>



static long ft_zero = 0;

static long ft_int_max = INT_MAX;



struct ctl_table fanotify_table[] = {

	{

		.procname	= "max_user_groups",

		.data	= &init_user_ns.ucount_max[UCOUNT_FANOTIFY_GROUPS],

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(long),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &ft_zero,

		.extra2		= &ft_int_max,

	},

	{

		.procname	= "max_user_marks",

		.data	= &init_user_ns.ucount_max[UCOUNT_FANOTIFY_MARKS],

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(long),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &ft_zero,

		.extra2		= &ft_int_max,

	},

	{

		.procname	= "max_queued_events",

fs/notify/inotify/inotify_user.c

+11 −6
Original line number Diff line number Diff line
@@ -55,22 +55,27 @@ struct kmem_cache *inotify_inode_mark_cachep __read_mostly; 


#include <linux/sysctl.h>



static long it_zero = 0;

static long it_int_max = INT_MAX;



struct ctl_table inotify_table[] = {

	{

		.procname	= "max_user_instances",

		.data		= &init_user_ns.ucount_max[UCOUNT_INOTIFY_INSTANCES],

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(long),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &it_zero,

		.extra2		= &it_int_max,

	},

	{

		.procname	= "max_user_watches",

		.data		= &init_user_ns.ucount_max[UCOUNT_INOTIFY_WATCHES],

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(long),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &it_zero,

		.extra2		= &it_int_max,

	},

	{

		.procname	= "max_queued_events",

kernel/ucount.c

+11 −8
Original line number Diff line number Diff line
@@ -58,14 +58,17 @@ static struct ctl_table_root set_root = { 
	.permissions = set_permissions,

};



static long ue_zero = 0;

static long ue_int_max = INT_MAX;



#define UCOUNT_ENTRY(name)					\

	{							\

		.procname	= name,				\

		.maxlen		= sizeof(int),		\

		.maxlen		= sizeof(long),			\

		.mode		= 0644,				\

		.proc_handler	= proc_dointvec_minmax,	\

		.extra1		= SYSCTL_ZERO,		\

		.extra2		= SYSCTL_INT_MAX,	\

		.proc_handler	= proc_doulongvec_minmax,	\

		.extra1		= &ue_zero,			\

		.extra2		= &ue_int_max,			\

	}

static struct ctl_table user_table[] = {

	UCOUNT_ENTRY("max_user_namespaces"),