f2fs: fix to check inline_xattr_size boundary correctly
Chao Yu
maintainerPATCH v2 1/1 f2fs: fix to check inline_xattr_size boundary correctly
From: Chao Yu <[email protected]>
We use below condition to check inline_xattr_size boundary:
if (!F2FS_OPTION(sbi).inline_xattr_size || F2FS_OPTION(sbi).inline_xattr_size >= DEF_ADDRS_PER_INODE - F2FS_TOTAL_EXTRA_ATTR_SIZE - DEF_INLINE_RESERVED_SIZE - DEF_MIN_INLINE_SIZE)
There is there problems in that check:
- we should allow inline_xattr_size equaling to min size of inline {data,dentry} area.
- F2FS_TOTAL_EXTRA_ATTR_SIZE and inline_xattr_size are based on different size unit, previous one is 4 bytes, latter one is 1 bytes.
- DEF_MIN_INLINE_SIZE only indicate min size of inline data area, however, we need to consider min size of inline dentry area as well, minimal inline dentry should at least contain two entries: '.' and '..', so that min inline_dentry size is 40 bytes.
.bitmap 1 * 1 = 1
.reserved 1 * 1 = 1
.dentry 11 * 2 = 22
.filename 8 * 2 = 16
total 40
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least.
fs/f2fs/f2fs.h | 1 - fs/f2fs/super.c | 13 +++++++------ include/linux/f2fs_fs.h | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-)
fs/f2fs/f2fs.h +0 -1
@@ -459,7 +459,6 @@ struct f2fs_flush_device {/* for inline stuff */ #define DEF_INLINE_RESERVED_SIZE 1 -#define DEF_MIN_INLINE_SIZE 1static inline int get_extra_isize (struct inode *inode);static inline int get_inline_xattr_addrs (struct inode *inode);#define MAX_INLINE_DATA (inode) (sizeof(__le32) * \
fs/f2fs/super.c +7 -6
@@ -834,12 +834,13 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (!F2FS_OPTION (sbi).inline_xattr_size || -F2FS_OPTION (sbi).inline_xattr_size >= -DEF_ADDRS_PER_INODE - -F2FS_TOTAL_EXTRA_ATTR_SIZE - -DEF_INLINE_RESERVED_SIZE - -DEF_MIN_INLINE_SIZE ) { +if (F2FS_OPTION (sbi).inline_xattr_size < +sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || +F2FS_OPTION (sbi).inline_xattr_size > +DEF_ADDRS_PER_INODE - +F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) - +DEF_INLINE_RESERVED_SIZE - +MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) {f2fs_msg (sb,KERN_ERR ,"inline xattr size is out of range" );return -EINVAL ;
include/linux/f2fs_fs.h +7 -6
@@ -490,12 +490,12 @@ typedef __le32 f2fs_hash_t;/* * space utilization of regular dentry and inline dentry (w/o extra reservation) -* regular dentry inline dentry -* bitmap 1 * 27 = 27 1 * 23 = 23 -* reserved 1 * 3 = 3 1 * 7 = 7 -* dentry 11 * 214 = 2354 11 * 182 = 2002 -* filename 8 * 214 = 1712 8 * 182 = 1456 -* total 4096 3488 +* regular dentry inline dentry (def) inline dentry (min) +* bitmap 1 * 27 = 27 1 * 23 = 23 1 * 1 = 1 +* reserved 1 * 3 = 3 1 * 7 = 7 1 * 1 = 1 +* dentry 11 * 214 = 2354 11 * 182 = 2002 11 * 2 = 22 +* filename 8 * 214 = 1712 8 * 182 = 1456 8 * 2 = 16 +* total 4096 3488 40 * * Note: there are more reserved space in inline dentry than in regular * dentry, when converting inline dentry we should handle this carefully.
@@ -507,6 +507,7 @@ typedef __le32 f2fs_hash_t;#define SIZE_OF_RESERVED (PAGE_SIZE - ((SIZE_OF_DIR_ENTRY + \ F2FS_SLOT_LEN) * \ NR_DENTRY_IN_BLOCK + SIZE_OF_DENTRY_BITMAP)) +#define MIN_INLINE_DENTRY_SIZE 40/* just include '.' and '..' entries */ /* One directory entry slot representing F2FS_SLOT_LEN-sized file name */ struct f2fs_dir_entry {
Signature · 1 line
2.18.0
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least.
...
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)
No sure we should set this low bound as above... now I guess original non-zero check is enough.
How do you think of setting inline_xattr_size range as (0, MAX_INLINE_XATTR_SIZE]?
Thanks,
Ping,
Quoted 29 lines · Chao Yu
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least....
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)No sure we should set this low bound as above... now I guess original non-zero check is enough.
How do you think of setting
inline_xattr_sizerange as (0,MAX_INLINE_XATTR_SIZE]?Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerQuoted 10 lines · Chao Yu
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least....
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)No sure we should set this low bound as above... now I guess original non-zero check is enough.
How do you think of setting
inline_xattr_sizerange as (0,MAX_INLINE_XATTR_SIZE]?
How about this?
--- fs/f2fs/super.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/f2fs/super.c +11 -6
@@ -821,6 +821,8 @@ static int parse_options(struct super_block *sb, char *options) }if (test_opt (sbi,INLINE_XATTR_SIZE )) { +int min_size, max_size; +if (!f2fs_sb_has_extra_attr (sbi) || !f2fs_sb_has_flexible_inline_xattr (sbi)) { f2fs_msg(sb, KERN_ERR,
@@ -834,15 +836,18 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (F2FS_OPTION (sbi).inline_xattr_size < -sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || -F2FS_OPTION (sbi).inline_xattr_size > -DEF_ADDRS_PER_INODE - + + min_size =sizeof (struct f2fs_xattr_header ) /sizeof (__le32); + max_size =DEF_ADDRS_PER_INODE -F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) -DEF_INLINE_RESERVED_SIZE - -MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) { +MIN_INLINE_DENTRY_SIZE /sizeof (__le32); + +if (F2FS_OPTION (sbi).inline_xattr_size < min || +F2FS_OPTION (sbi).inline_xattr_size > max) {f2fs_msg (sb,KERN_ERR , -"inline xattr size is out of range" ); +"inline xattr size is out of range: %d ~ %d" , + min, max);return -EINVAL ; } }
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least....
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)No sure we should set this low bound as above... now I guess original non-zero check is enough.
Quoted 4 lines
Quoted 2 lines
How do you think of setting
inline_xattr_sizerange as (0,MAX_INLINE_XATTR_SIZE]?How about this?
If you think it's necessary to check low bound with size of xattr header, I'm also okay with that.
And below diff looks good to me, could you please merge this into original one?
Thanks,
Quoted 44 lines
--- fs/f2fs/super.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)fs/f2fs/super.c +11
-6@@ -821,6 +821,8 @@ static int parse_options(struct super_block *sb, char *options) }if (test_opt (sbi,INLINE_XATTR_SIZE )) { +int min_size, max_size; +if (!f2fs_sb_has_extra_attr (sbi) || !f2fs_sb_has_flexible_inline_xattr (sbi)) { f2fs_msg(sb, KERN_ERR,@@ -834,15 +836,18 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (F2FS_OPTION (sbi).inline_xattr_size < -sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || -F2FS_OPTION (sbi).inline_xattr_size > -DEF_ADDRS_PER_INODE - + + min_size =sizeof (struct f2fs_xattr_header ) /sizeof (__le32); + max_size =DEF_ADDRS_PER_INODE -F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) -DEF_INLINE_RESERVED_SIZE - -MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) { +MIN_INLINE_DENTRY_SIZE /sizeof (__le32); + +if (F2FS_OPTION (sbi).inline_xattr_size < min || +F2FS_OPTION (sbi).inline_xattr_size > max) {f2fs_msg (sb,KERN_ERR , -"inline xattr size is out of range" ); +"inline xattr size is out of range: %d ~ %d" , + min, max);return -EINVAL ; } }
Jaegeuk Kim
maintainerQuoted 21 lines · Chao Yu
Quoted 20 lines · Jaegeuk Kim
Quoted 18 lines · Chao Yu
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least....
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)No sure we should set this low bound as above... now I guess original non-zero check is enough.
How do you think of setting
inline_xattr_sizerange as (0,MAX_INLINE_XATTR_SIZE]?
Quoted 8 lines
Quoted 1 line
How about this?
If you think it's necessary to check low bound with size of xattr header, I'm also okay with that.
And below diff looks good to me, could you please merge this into original one?
Thanks,
I had to add this on top of branch.
Quoted 1 line
From
70db5b04cbe19e5ae7e85ada2d3e82bcfdf90352Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Tue, 12 Mar 2019 11:49:53 -0700
Subject: [PATCH] f2fs: give some messages for inline_xattr_size
This patch adds some kernel messages when user sets wrong inline_xattr_size.
--- fs/f2fs/super.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/f2fs/super.c +11 -6
@@ -821,6 +821,8 @@ static int parse_options(struct super_block *sb, char *options) }if (test_opt (sbi,INLINE_XATTR_SIZE )) { +int min_size, max_size; +if (!f2fs_sb_has_extra_attr (sbi) || !f2fs_sb_has_flexible_inline_xattr (sbi)) { f2fs_msg(sb, KERN_ERR,
@@ -834,15 +836,18 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (F2FS_OPTION (sbi).inline_xattr_size < -sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || -F2FS_OPTION (sbi).inline_xattr_size > -DEF_ADDRS_PER_INODE - + + min_size =sizeof (struct f2fs_xattr_header ) /sizeof (__le32); + max_size =DEF_ADDRS_PER_INODE -F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) -DEF_INLINE_RESERVED_SIZE - -MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) { +MIN_INLINE_DENTRY_SIZE /sizeof (__le32); + +if (F2FS_OPTION (sbi).inline_xattr_size < min_size || +F2FS_OPTION (sbi).inline_xattr_size > max_size) {f2fs_msg (sb,KERN_ERR , -"inline xattr size is out of range" ); +"inline xattr size is out of range: %d ~ %d" , + min_size, max_size);return -EINVAL ; } }
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 24 lines · Jaegeuk Kim
Quoted 23 lines · Chao Yu
Quoted 21 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu
Hi Jaegeuk,
Quoted 4 lines · Chao Yu
---
v2:
- fix lower bound check, inline xattr size should be larger than xattr_header's size at least....
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (F2FS_OPTION(sbi).inline_xattr_size < + sizeof(struct f2fs_xattr_header) / sizeof(__le32)No sure we should set this low bound as above... now I guess original non-zero check is enough.
How do you think of setting
inline_xattr_sizerange as (0,MAX_INLINE_XATTR_SIZE]?How about this?
Quoted 8 lines
Quoted 6 lines
If you think it's necessary to check low bound with size of xattr header, I'm also okay with that.
And below diff looks good to me, could you please merge this into original one?
Thanks,
I had to add this on top of branch.
No problem.
Quoted 9 lines
Quoted 2 lines
From
70db5b04cbe19e5ae7e85ada2d3e82bcfdf90352Mon Sep 17 00:00:00 2001From: Jaegeuk Kim <[email protected]>
Date: Tue, 12 Mar 2019 11:49:53 -0700
Subject: [PATCH] f2fs: give some messages forinline_xattr_sizeThis patch adds some kernel messages when user sets wrong
inline_xattr_size.Fixes 500e0b28ecd3 ("f2fs: fix to check inline_xattr_size boundary correctly")
But this commit id may change when Linus pull your merge request...
Thanks,
Quoted 45 lines
Signed-off-by Chao Yu <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/super.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)fs/f2fs/super.c +11
-6@@ -821,6 +821,8 @@ static int parse_options(struct super_block *sb, char *options) }if (test_opt (sbi,INLINE_XATTR_SIZE )) { +int min_size, max_size; +if (!f2fs_sb_has_extra_attr (sbi) || !f2fs_sb_has_flexible_inline_xattr (sbi)) { f2fs_msg(sb, KERN_ERR,@@ -834,15 +836,18 @@ static int parse_options(struct super_block *sb, char *options) "set with inline_xattr option");return -EINVAL ; } -if (F2FS_OPTION (sbi).inline_xattr_size < -sizeof (struct f2fs_xattr_header ) /sizeof (__le32) || -F2FS_OPTION (sbi).inline_xattr_size > -DEF_ADDRS_PER_INODE - + + min_size =sizeof (struct f2fs_xattr_header ) /sizeof (__le32); + max_size =DEF_ADDRS_PER_INODE -F2FS_TOTAL_EXTRA_ATTR_SIZE /sizeof (__le32) -DEF_INLINE_RESERVED_SIZE - -MIN_INLINE_DENTRY_SIZE /sizeof (__le32)) { +MIN_INLINE_DENTRY_SIZE /sizeof (__le32); + +if (F2FS_OPTION (sbi).inline_xattr_size < min_size || +F2FS_OPTION (sbi).inline_xattr_size > max_size) {f2fs_msg (sb,KERN_ERR , -"inline xattr size is out of range" ); +"inline xattr size is out of range: %d ~ %d" , + min_size, max_size);return -EINVAL ; } }