fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
Subsystems (6)
PATCH 1/1 fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag; otherwise skip ACL_MASK.
use macro instead of hard code number (by Chen Gang)
--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 9 +++++++++ 7 files changed, 45 insertions(+), 31 deletions(-)
fs/ext2/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext3/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext4/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/f2fs/acl.c +7 -5
@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/jffs2/acl.c +9 -6
@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/reiserfs/acl.h +5 -5
@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
include/linux/posix_acl.h +9 -0
@@ -26,6 +26,15 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] Only if there is at least one ACL_USER or ACL_GROUP tag; +* otherwise skip ACL_MASK. +*/ +#define ACL_MAX_SHORT_ENTRY (4) +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)
Signature · 1 line
1.7.10.4
Jan Kara
reviewerQuoted 14 lines · Chen Gang
give comments (by Theodore Ts'o)
ACL_USER_OBJACL_USER*[1]ACL_GROUP_OBJACL_GROUP*[1] ACL_MASK[2]ACL_OTHER[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least oneACL_USERorACL_GROUPtag; otherwise skipACL_MASK.use macro instead of hard code number (by Chen Gang)
Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Chen Gang <[email protected]>---
...
Quoted 7 lines
include/linux/posix_acl.h +0
-0@@ -26,6 +26,15 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20)
include/linux/posix_acl.h line 37
Quoted 10 lines
include/linux/posix_acl.h +9
-0+/* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] Only if there is at least one ACL_USER or ACL_GROUP tag; +* otherwise skip ACL_MASK. +*/ +#define ACL_MAX_SHORT_ENTRY (4) +
I agree that defining a constant for this makes sence. Just please be
more verbose with the comment. This is hardly readable for anyone not knowing what's going on in advance. Also braces around 4 are superfluous. Add something like the comment below before posix_acl_valid():
/*
* posix_acl_valid() makes sure ACL format is the following:
* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER *
* [1] Where * is the regexp sense of "0 or more times"
* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present. */
Then add comment before definition of ACL_MAX_SHORT_ENTRY:
/*
* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then
* all of them are short. Otherwise exactly 4 entries are short ones and
* other have full length. See comment before that function for exact ACL
* format.
*/
Honza
Quoted 5 lines
include/linux/posix_acl.h +0
-0/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)Signature · 1 line
1.7.10.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v2 1/1 fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
In reply to Chen Ganggive comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag; otherwise skip ACL_MASK.
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.
use macro instead of hard code number (by Chen Gang)
--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 8 ++++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 52 insertions(+), 31 deletions(-)
fs/ext2/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext3/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext4/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/f2fs/acl.c +7 -5
@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/jffs2/acl.c +9 -6
@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/posix_acl.c +8 -0
@@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] Only if there is at least one ACL_USER or ACL_GROUP tag; +* otherwise skip ACL_MASK. */ int posix_acl_valid (const struct posix_acl *acl)
fs/reiserfs/acl.h +5 -5
@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
include/linux/posix_acl.h +8 -0
@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY (4) +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)
Signature · 1 line
1.7.10.4
Quoted 1 line · Chen Gang
+#define
ACL_MAX_SHORT_ENTRY(4)
sorry,
should use "4" instead of "(4)".
I need send patch v3.
Signature · 3 lines
Chen Gang Asianux Corporation
PATCH v3 1/1 fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least one ACL_USER or ACL_GROUP tag; otherwise skip ACL_MASK.
give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.
use macro instead of hard code number (by Chen Gang)
--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 8 ++++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 52 insertions(+), 31 deletions(-)
fs/ext2/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext3/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext4/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/f2fs/acl.c +7 -5
@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/jffs2/acl.c +9 -6
@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/posix_acl.c +8 -0
@@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] Only if there is at least one ACL_USER or ACL_GROUP tag; +* otherwise skip ACL_MASK. */ int posix_acl_valid (const struct posix_acl *acl)
fs/reiserfs/acl.h +5 -5
@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
include/linux/posix_acl.h +8 -0
@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY 4 +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)
Signature · 1 line
1.7.10.4
Jan Kara
reviewerQuoted 8 lines · Chen Gang
give comments (by Theodore Ts'o)
ACL_USER_OBJACL_USER*[1]ACL_GROUP_OBJACL_GROUP*[1] ACL_MASK[2]ACL_OTHER[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least oneACL_USERorACL_GROUPtag; otherwise skipACL_MASK.
Note that I actually updated the entry [2] to be more precise in my
suggested comment. I wrote:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
Please use this formulation because the old version suggests ACL_MASK
cannot be present if neither ACL_USER nor ACL_GROUP are present and that's not true. Otherwise your patch looks fine. Thanks!
Honza
Quoted 303 lines
give comments (by Jan Kara)
posix_acl_valid()makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.use macro instead of hard code number (by Chen Gang)
Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Jan Kara <[email protected]>Signed-off-by Chen Gang <[email protected]>--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 8 ++++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 52 insertions(+), 31 deletions(-)fs/ext2/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext3/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext4/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/f2fs/acl.c +7
-5@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/jffs2/acl.c +9
-6@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/posix_acl.c +8
-0@@ -72,6 +72,14 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] Only if there is at least one ACL_USER or ACL_GROUP tag; +* otherwise skip ACL_MASK. */ int posix_acl_valid (const struct posix_acl *acl)fs/reiserfs/acl.h +5
-5@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }include/linux/posix_acl.h +8
-0@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY 4 +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)Signature · 1 line
1.7.10.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 9 lines · Jan Kara
Quoted 8 lines · Chen Gang
Quoted 8 lines
give comments (by Theodore Ts'o)
ACL_USER_OBJACL_USER*[1]ACL_GROUP_OBJACL_GROUP*[1] ACL_MASK[2]ACL_OTHER[1] Where * is the regexp sense of "0 or more times"
[2] Only if there is at least oneACL_USERorACL_GROUPtag; otherwise skipACL_MASK.
Quoted 7 lines
Note that I actually updated the entry [2] to be more precise in my
suggested comment. I wrote:
[2] IfACL_USERorACL_GROUPis present, thenACL_MASKmust be present.Please use this formulation because the old version suggests
ACL_MASK
cannot be present if neitherACL_USERnorACL_GROUPare present and that's not true. Otherwise your patch looks fine. Thanks!
according to the implementation of posix_acl_valid (contents at bottom).
new comments are more precise to match the implementation.
it means:
if new comments was incorrect, the implementation would be incorrect.
welcome another members (especially Theodore Ts'o) to giving confirmation or completion.
I should wait 2 days, before send patch v4 with new comments.
no additional reply within 2 days, means new comments is correct.
Regards
gchen.
76 int
77 posix_acl_valid(const struct posix_acl *acl)
78 {
79 const struct posix_acl_entry *pa, *pe; 80 int state = ACL_USER_OBJ; 81 kuid_t prev_uid = INVALID_UID; 82 kgid_t prev_gid = INVALID_GID; 83 int needs_mask = 0;
84
85 FOREACH_ACL_ENTRY(pa, acl, pe) {
86 if (pa->e_perm & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))
87 return -EINVAL;
88 switch (pa->e_tag) {
89 case ACL_USER_OBJ:
90 if (state == ACL_USER_OBJ) {
91 state = ACL_USER;
92 break;
93 }
94 return -EINVAL;
95
96 case ACL_USER:
97 if (state != ACL_USER)
98 return -EINVAL;
99 if (!uid_valid(pa->e_uid))
100 return -EINVAL;
101 if (uid_valid(prev_uid) &&
102 uid_lte(pa->e_uid, prev_uid))
103 return -EINVAL;
104 prev_uid = pa->e_uid; 105 needs_mask = 1; 106 break;
107
108 case ACL_GROUP_OBJ:
109 if (state == ACL_USER) {
110 state = ACL_GROUP;
111 break;
112 }
113 return -EINVAL;
114
115 case ACL_GROUP:
116 if (state != ACL_GROUP)
117 return -EINVAL;
118 if (!gid_valid(pa->e_gid))
119 return -EINVAL;
120 if (gid_valid(prev_gid) &&
121 gid_lte(pa->e_gid, prev_gid))
122 return -EINVAL;
123 prev_gid = pa->e_gid; 124 needs_mask = 1; 125 break;
126
127 case ACL_MASK:
128 if (state != ACL_GROUP)
129 return -EINVAL;
130 state = ACL_OTHER;
131 break;
132
133 case ACL_OTHER:
134 if (state == ACL_OTHER ||
135 (state == ACL_GROUP && !needs_mask)) {
136 state = 0;
137 break;
138 }
139 return -EINVAL;
140
141 default:
142 return -EINVAL;
143 }
144 }
145 if (state == 0)
146 return 0;
147 return -EINVAL;
148 }
Signature · 7 lines
Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 1/1 fs/ext*,f2fs,jffs2,reiserfs: give comments for acl size and count calculation
In reply to Jan Karagive comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER
[1] Where * is the regexp sense of "0 or more times"
[2] ... give comments (by Jan Kara)
posix_acl_valid() makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.
also correct the '[2]' comments:
[2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present.
use macro instead of hard code number (by Chen Gang)
--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 7 +++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 51 insertions(+), 31 deletions(-)
fs/ext2/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext3/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/ext4/acl.h +5 -5
@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }
@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;
@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
fs/f2fs/acl.c +7 -5
@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }
@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;
@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/jffs2/acl.c +9 -6
@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }
@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }
fs/posix_acl.c +7 -0
@@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present. */ int posix_acl_valid (const struct posix_acl *acl)
fs/reiserfs/acl.h +5 -5
@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }
@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;
@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }
include/linux/posix_acl.h +8 -0
@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY 4 +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)
Signature · 1 line
1.7.10.4
Hello all:
consult:
excuse me, I wonder who is the final applier of this patch ?
it seems too many relative members are in this mailing list.
(it is why I also included [email protected] as 'THE REST')
thanks.
:-)
by the way:
originally, I send this mail by checking MAINTAINERS file, mannualy. and this time (now), I reply this mail by using scripts/get_maintainers.pl.
(but still add [email protected] as 'THE REST')
Regards
gchen.
Quoted 310 lines · Chen Gang
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER [1] Where * is the regexp sense of "0 or more times" [2] ...give comments (by Jan Kara)
posix_acl_valid()makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.
also correct the '[2]' comments:
[2] IfACL_USERorACL_GROUPis present, thenACL_MASKmust be present.use macro instead of hard code number (by Chen Gang)
Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Jan Kara <[email protected]>Signed-off-by Chen Gang <[email protected]>--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 7 +++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 51 insertions(+), 31 deletions(-)fs/ext2/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext3/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext4/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/f2fs/acl.c +7
-5@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/jffs2/acl.c +9
-6@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/posix_acl.c +7
-0@@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present. */ int posix_acl_valid (const struct posix_acl *acl)fs/reiserfs/acl.h +5
-5@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }include/linux/posix_acl.h +8
-0@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY 4 +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)
Signature · 7 lines
Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Jan Kara
reviewerQuoted 9 lines · Chen Gang
Hello all:
consult:
excuse me, I wonder who is the final applier of this patch ?
it seems too many relative members are in this mailing list.
(it is why I also included [email protected] as 'THE REST')thanks.
Quoted 7 lines
:-)
by the way:
originally, I send this mail by checkingMAINTAINERSfile, mannualy. and this time (now), I reply this mail by usingscripts/get_maintainers.pl.
(but still add [email protected] as 'THE REST')
Al Viro (you have him on CC list) is the right guy to merge this patch.
But he's not very responsive at times... You can also check whether he just didn't silently merge your patch into his tree -
http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
I don't see the patch there right now, last update to the tree has happened 3 weeks ago. Maybe he's on vacation...
Honza
Quoted 317 lines
Quoted 310 lines · Chen Gang
give comments (by Theodore Ts'o)
ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER [1] Where * is the regexp sense of "0 or more times" [2] ...give comments (by Jan Kara)
posix_acl_valid()makes sure that if there are <= 4 ACL entries, then all of them are short. Otherwise exactly 4 entries are short ones and other have full length. See comment before that function for exact ACL format.
also correct the '[2]' comments:
[2] IfACL_USERorACL_GROUPis present, thenACL_MASKmust be present.use macro instead of hard code number (by Chen Gang)
Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Jan Kara <[email protected]>Signed-off-by Chen Gang <[email protected]>--- fs/ext2/acl.h | 10 +++++----- fs/ext3/acl.h | 10 +++++----- fs/ext4/acl.h | 10 +++++----- fs/f2fs/acl.c | 12 +++++++----- fs/jffs2/acl.c | 15 +++++++++------ fs/posix_acl.c | 7 +++++++ fs/reiserfs/acl.h | 10 +++++----- include/linux/posix_acl.h | 8 ++++++++ 8 files changed, 51 insertions(+), 31 deletions(-)fs/ext2/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext2_acl_header) + count *sizeof (ext2_acl_entry_short); }else {return sizeof (ext2_acl_header) + -4 *sizeof (ext2_acl_entry_short) + - (count -4 ) *sizeof (ext2_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext2_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext2_acl_count(size_t size) {ssize_t s; size -=sizeof (ext2_acl_header); - s = size -4 *sizeof (ext2_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext2_acl_entry_short);if (s <0 ) {if (size %sizeof (ext2_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext2_acl_count(size_t size) }else {if (s %sizeof (ext2_acl_entry))return -1 ; -return s /sizeof (ext2_acl_entry) +4 ; +return s /sizeof (ext2_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext3/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext3_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext3_acl_header) + count *sizeof (ext3_acl_entry_short); }else {return sizeof (ext3_acl_header) + -4 *sizeof (ext3_acl_entry_short) + - (count -4 ) *sizeof (ext3_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext3_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext3_acl_count(size_t size) {ssize_t s; size -=sizeof (ext3_acl_header); - s = size -4 *sizeof (ext3_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext3_acl_entry_short);if (s <0 ) {if (size %sizeof (ext3_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext3_acl_count(size_t size) }else {if (s %sizeof (ext3_acl_entry))return -1 ; -return s /sizeof (ext3_acl_entry) +4 ; +return s /sizeof (ext3_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/ext4/acl.h +5
-5@@ -25,13 +25,13 @@ typedef struct {static inline size_t ext4_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (ext4_acl_header) + count *sizeof (ext4_acl_entry_short); }else {return sizeof (ext4_acl_header) + -4 *sizeof (ext4_acl_entry_short) + - (count -4 ) *sizeof (ext4_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (ext4_acl_entry); } }@@ -39,7 +39,7 @@ static inline int ext4_acl_count(size_t size) {ssize_t s; size -=sizeof (ext4_acl_header); - s = size -4 *sizeof (ext4_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (ext4_acl_entry_short);if (s <0 ) {if (size %sizeof (ext4_acl_entry_short))return -1 ;@@ -47,7 +47,7 @@ static inline int ext4_acl_count(size_t size) }else {if (s %sizeof (ext4_acl_entry))return -1 ; -return s /sizeof (ext4_acl_entry) +4 ; +return s /sizeof (ext4_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }fs/f2fs/acl.c +7
-5@@ -22,13 +22,15 @@static inline size_t f2fs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct f2fs_acl_header ) + count *sizeof (struct f2fs_acl_entry_short ); }else {return sizeof (struct f2fs_acl_header ) + -4 *sizeof (struct f2fs_acl_entry_short ) + - (count -4 ) *sizeof (struct f2fs_acl_entry ); +ACL_MAX_SHORT_ENTRY + *sizeof (struct f2fs_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct f2fs_acl_entry ); } }@@ -36,7 +38,7 @@ static inline int f2fs_acl_count(size_t size) {ssize_t s; size -=sizeof (struct f2fs_acl_header ); - s = size -4 *sizeof (struct f2fs_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (struct f2fs_acl_entry_short );if (s <0 ) {if (size %sizeof (struct f2fs_acl_entry_short ))return -1 ;@@ -44,7 +46,7 @@ static inline int f2fs_acl_count(size_t size) }else {if (s %sizeof (struct f2fs_acl_entry ))return -1 ; -return s /sizeof (struct f2fs_acl_entry ) +4 ; +return s /sizeof (struct f2fs_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/jffs2/acl.c +9
-6@@ -25,13 +25,15 @@static size_t jffs2_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (struct jffs2_acl_header ) + count *sizeof (struct jffs2_acl_entry_short ); }else {return sizeof (struct jffs2_acl_header ) - +4 *sizeof (struct jffs2_acl_entry_short ) - + (count -4 ) *sizeof (struct jffs2_acl_entry ); + +ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short ) + + (count -ACL_MAX_SHORT_ENTRY ) + *sizeof (struct jffs2_acl_entry ); } }@@ -40,15 +42,16 @@ static int jffs2_acl_count(size_t size)size_t s; size -=sizeof (struct jffs2_acl_header ); -if (size <4 *sizeof (struct jffs2_acl_entry_short )) { +if (size <ACL_MAX_SHORT_ENTRY *sizeof (struct jffs2_acl_entry_short )) {if (size %sizeof (struct jffs2_acl_entry_short ))return -1 ;return size /sizeof (struct jffs2_acl_entry_short ); }else { - s = size -4 *sizeof (struct jffs2_acl_entry_short ); + s = size -ACL_MAX_SHORT_ENTRY + *sizeof (struct jffs2_acl_entry_short );if (s %sizeof (struct jffs2_acl_entry ))return -1 ; -return s /sizeof (struct jffs2_acl_entry ) +4 ; +return s /sizeof (struct jffs2_acl_entry ) +ACL_MAX_SHORT_ENTRY ; } }fs/posix_acl.c +7
-0@@ -72,6 +72,13 @@ posix_acl_clone(const struct posix_acl *acl, gfp_t flags)/* * Check if an acl is valid. Returns 0 if it is, or -E... otherwise. +* +* make sure ACL format is the following: +* +* ACL_USER_OBJ ACL_USER*[1] ACL_GROUP_OBJ ACL_GROUP*[1] ACL_MASK[2] ACL_OTHER +* +* [1] Where * is the regexp sense of "0 or more times" +* [2] If ACL_USER or ACL_GROUP is present, then ACL_MASK must be present. */ int posix_acl_valid (const struct posix_acl *acl)fs/reiserfs/acl.h +5
-5@@ -20,13 +20,13 @@ typedef struct {static inline size_t reiserfs_acl_size (int count) { -if (count <=4 ) { +if (count <=ACL_MAX_SHORT_ENTRY ) {return sizeof (reiserfs_acl_header) + count *sizeof (reiserfs_acl_entry_short); }else {return sizeof (reiserfs_acl_header) + -4 *sizeof (reiserfs_acl_entry_short) + - (count -4 ) *sizeof (reiserfs_acl_entry); +ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short) + + (count -ACL_MAX_SHORT_ENTRY ) *sizeof (reiserfs_acl_entry); } }@@ -34,7 +34,7 @@ static inline int reiserfs_acl_count(size_t size) {ssize_t s; size -=sizeof (reiserfs_acl_header); - s = size -4 *sizeof (reiserfs_acl_entry_short); + s = size -ACL_MAX_SHORT_ENTRY *sizeof (reiserfs_acl_entry_short);if (s <0 ) {if (size %sizeof (reiserfs_acl_entry_short))return -1 ;@@ -42,7 +42,7 @@ static inline int reiserfs_acl_count(size_t size) }else {if (s %sizeof (reiserfs_acl_entry))return -1 ; -return s /sizeof (reiserfs_acl_entry) +4 ; +return s /sizeof (reiserfs_acl_entry) +ACL_MAX_SHORT_ENTRY ; } }include/linux/posix_acl.h +8
-0@@ -26,6 +26,14 @@#define ACL_MASK (0x10)#define ACL_OTHER (0x20) +/* +* posix_acl_valid() makes sure that if there are <= 4 ACL entries, then +* all of them are short. Otherwise exactly 4 entries are short ones and +* other have full length. See comment before that function for exact ACL +* format. +*/ +#define ACL_MAX_SHORT_ENTRY 4 +/* permissions in the e_perm field */ #define ACL_READ (0x04)#define ACL_WRITE (0x02)Signature · 3 lines
Chen Gang Asianux Corporation
Signature · 6 lines
Jan Kara <[email protected]> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Jan Kara
Al Viro (you have him on CC list) is the right guy to merge this patch.
But he's not very responsive at times... You can also check whether he just didn't silently merge your patch into his tree -
http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
I don't see the patch there right now, last update to the tree has happened 3 weeks ago. Maybe he's on vacation...
thank you very much for your patient details replying.
sorry, it is my fault for my original mail address not including Viro
so it is necessary to wait additional week for getting his response.
next time, I need only use ./script/get_maintainers.pl to get mail address.
:-(
Signature · 7 lines
Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
(at least for me, most of comment patches are valuable for integrating)
thanks.
gchen.
Quoted 18 lines · Chen Gang
Quoted 6 lines · Jan Kara
Al Viro (you have him on CC list) is the right guy to merge this patch.
But he's not very responsive at times... You can also check whether he just didn't silently merge your patch into his tree -
http://git.kernel.org/?p=linux/kernel/git/viro/vfs.git
I don't see the patch there right now, last update to the tree has happened 3 weeks ago. Maybe he's on vacation...thank you very much for your patient details replying.
sorry, it is my fault for my original mail address not including Viro
so it is necessary to wait additional week for getting his response.next time, I need only use
./script/get_maintainers.plto get mail address.:-(
Signature · 7 lines
Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
I am so sorry for not including your mail address for this patch, originally
(it is really my fault, although the comment patch itself is innocence)
I should notice next time.
(and now, I always use ./script/get_maintainers.pl to get mail address)
maybe, the comment patch seems quite minor.
but at least for me, I think most of comment patches are not minor.
(in correct place, providing correct comments are not minor)
I also plan to provide more comment patches, in 2nd half of this year.
(if it seems not a good idea, please tell me, thanks)
if you have another opinions, welcome to discussion.
whether this patch will be applied or not, I still thank to relative members:
Theodore Ts'o: always give helpful responses at key point time.
(not only for this patch).
Jan Kara: provide more useful informations in action.
(not only for this patch).
thanks.
gchen.
Quoted 10 lines · Chen Gang
Hello Al Viro:
could you give a glance for this comment patch when you have time ?
(at least for me, most of comment patches are valuable for integrating)
thanks.
gchen.
Signature · 7 lines
Chen Gang Asianux Corporation -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html