ucounts: add missing data type changes
Subsystems (2)
PATCH v2 1/1 ucounts: add missing data type changes
commit f9c82a4ea89c3 ("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.
--- fs/notify/fanotify/fanotify_user.c | 10 ++++++---- kernel/ucount.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-)
fs/notify/fanotify/fanotify_user.c +6 -4
@@ -58,18 +58,20 @@ 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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "max_queued_events",
kernel/ucount.c +8 -8
@@ -58,14 +58,14 @@ static struct ctl_table_root set_root = { .permissions = set_permissions, }; -#define UCOUNT_ENTRY (name) \ - { \ - .procname = name, \ - .maxlen = sizeof(int), \ - .mode = 0644, \ - .proc_handler = proc_dointvec_minmax, \ - .extra1 = SYSCTL_ZERO, \ - .extra2 = SYSCTL_INT_MAX, \ +#define UCOUNT_ENTRY (name) \ + { \ + .procname = name, \ + .maxlen = sizeof(long), \ + .mode = 0644, \ + .proc_handler = proc_doulongvec_minmax, \ + .extra1 = SYSCTL_ZERO, \ + .extra2 = SYSCTL_INT_MAX, \ }static struct ctl_table user_table[] = {UCOUNT_ENTRY ("max_user_namespaces" ),
Signature · 1 line
2.25.1
Quoted 8 lines · Sven Schnelle
commit
f9c82a4ea89c3("Increase size of ucounts toatomic_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_*_namesfiles all contain 0.Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")Signed-off-by Sven Schnelle <[email protected]>
Eric, what do you think ?
Quoted 64 lines
--- fs/notify/fanotify/fanotify_user.c | 10 ++++++---- kernel/ucount.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-)fs/notify/fanotify/fanotify_user.c +6
-4@@ -58,18 +58,20 @@ 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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "max_queued_events",kernel/ucount.c +8
-8@@ -58,14 +58,14 @@ static struct ctl_table_root set_root = { .permissions = set_permissions, }; -#define UCOUNT_ENTRY (name) \ - { \ - .procname = name, \ - .maxlen = sizeof(int), \ - .mode = 0644, \ - .proc_handler = proc_dointvec_minmax, \ - .extra1 = SYSCTL_ZERO, \ - .extra2 = SYSCTL_INT_MAX, \ +#define UCOUNT_ENTRY (name) \ + { \ + .procname = name, \ + .maxlen = sizeof(long), \ + .mode = 0644, \ + .proc_handler = proc_doulongvec_minmax, \ + .extra1 = SYSCTL_ZERO, \ + .extra2 = SYSCTL_INT_MAX, \ }static struct ctl_table user_table[] = {UCOUNT_ENTRY ("max_user_namespaces" ),Signature · 1 line
2.25.1
Signature · 1 line
Rgrds, legion
Quoted 7 lines · Alexey Gladkov
Quoted 6 lines · Sven Schnelle
commit
f9c82a4ea89c3("Increase size of ucounts toatomic_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_*_namesfiles all contain 0.
Quoted 6 lines
Quoted 2 lines
Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")Signed-off-by Sven Schnelle <[email protected]>Acked-by Alexey Gladkov <[email protected]>Eric, what do you think ?
At a quick skim it looks good. I was to swamped last week to pick it up, but I plan on picking this up and getting it to Linus before the next -rc release.
Eric
Quoted 64 lines
Quoted 64 lines
--- fs/notify/fanotify/fanotify_user.c | 10 ++++++---- kernel/ucount.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-)fs/notify/fanotify/fanotify_user.c +6
-4@@ -58,18 +58,20 @@ 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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "max_queued_events",kernel/ucount.c +8
-8@@ -58,14 +58,14 @@ static struct ctl_table_root set_root = { .permissions = set_permissions, }; -#define UCOUNT_ENTRY (name) \ - { \ - .procname = name, \ - .maxlen = sizeof(int), \ - .mode = 0644, \ - .proc_handler = proc_dointvec_minmax, \ - .extra1 = SYSCTL_ZERO, \ - .extra2 = SYSCTL_INT_MAX, \ +#define UCOUNT_ENTRY (name) \ + { \ + .procname = name, \ + .maxlen = sizeof(long), \ + .mode = 0644, \ + .proc_handler = proc_doulongvec_minmax, \ + .extra1 = SYSCTL_ZERO, \ + .extra2 = SYSCTL_INT_MAX, \ }static struct ctl_table user_table[] = {UCOUNT_ENTRY ("max_user_namespaces" ),Signature · 1 line
2.25.1
Quoted 5 lines · Sven Schnelle
commit
f9c82a4ea89c3("Increase size of ucounts toatomic_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_*_namesfiles all contain 0.
As far as this goes I don't have any problem with this patch.
However it looks like you missed
fs/notify/inotify_user.c:inotify_table[].
Any chance you can add to the patch that verify things look ok and send version 3?
Thanks,
Eric
Quoted 63 lines
Fixes f9c82a4ea89c ("Increase size of ucounts to atomic_long_t")Signed-off-by Sven Schnelle <[email protected]>--- fs/notify/fanotify/fanotify_user.c | 10 ++++++---- kernel/ucount.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-)fs/notify/fanotify/fanotify_user.c +6
-4@@ -58,18 +58,20 @@ 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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_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, + .proc_handler = proc_doulongvec_minmax, .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "max_queued_events",kernel/ucount.c +8
-8@@ -58,14 +58,14 @@ static struct ctl_table_root set_root = { .permissions = set_permissions, }; -#define UCOUNT_ENTRY (name) \ - { \ - .procname = name, \ - .maxlen = sizeof(int), \ - .mode = 0644, \ - .proc_handler = proc_dointvec_minmax, \ - .extra1 = SYSCTL_ZERO, \ - .extra2 = SYSCTL_INT_MAX, \ +#define UCOUNT_ENTRY (name) \ + { \ + .procname = name, \ + .maxlen = sizeof(long), \ + .mode = 0644, \ + .proc_handler = proc_doulongvec_minmax, \ + .extra1 = SYSCTL_ZERO, \ + .extra2 = SYSCTL_INT_MAX, \ }static struct ctl_table user_table[] = {UCOUNT_ENTRY ("max_user_namespaces" ),