diff options
author | Randall Huang <huangrandall@google.com> | 2019-04-11 04:26:46 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2019-05-09 12:43:29 -0400 |
commit | 2777e654371dd4207a3a7f4fb5fa39550053a080 (patch) | |
tree | dec19364d501ad632e4bde7d10052a8ef3d4f83f | |
parent | c9c8ed50d94c613fc3f4917c51e9c75d493a312e (diff) |
f2fs: fix to avoid accessing xattr across the boundary
When we traverse xattr entries via __find_xattr(),
if the raw filesystem content is faked or any hardware failure occurs,
out-of-bound error can be detected by KASAN.
Fix the issue by introducing boundary check.
[ 38.402878] c7 1827 BUG: KASAN: slab-out-of-bounds in f2fs_getxattr+0x518/0x68c
[ 38.402891] c7 1827 Read of size 4 at addr ffffffc0b6fb35dc by task
[ 38.402935] c7 1827 Call trace:
[ 38.402952] c7 1827 [<ffffff900809003c>] dump_backtrace+0x0/0x6bc
[ 38.402966] c7 1827 [<ffffff9008090030>] show_stack+0x20/0x2c
[ 38.402981] c7 1827 [<ffffff900871ab10>] dump_stack+0xfc/0x140
[ 38.402995] c7 1827 [<ffffff9008325c40>] print_address_description+0x80/0x2d8
[ 38.403009] c7 1827 [<ffffff900832629c>] kasan_report_error+0x198/0x1fc
[ 38.403022] c7 1827 [<ffffff9008326104>] kasan_report_error+0x0/0x1fc
[ 38.403037] c7 1827 [<ffffff9008325000>] __asan_load4+0x1b0/0x1b8
[ 38.403051] c7 1827 [<ffffff90085fcc44>] f2fs_getxattr+0x518/0x68c
[ 38.403066] c7 1827 [<ffffff90085fc508>] f2fs_xattr_generic_get+0xb0/0xd0
[ 38.403080] c7 1827 [<ffffff9008395708>] __vfs_getxattr+0x1f4/0x1fc
[ 38.403096] c7 1827 [<ffffff9008621bd0>] inode_doinit_with_dentry+0x360/0x938
[ 38.403109] c7 1827 [<ffffff900862d6cc>] selinux_d_instantiate+0x2c/0x38
[ 38.403123] c7 1827 [<ffffff900861b018>] security_d_instantiate+0x68/0x98
[ 38.403136] c7 1827 [<ffffff9008377db8>] d_splice_alias+0x58/0x348
[ 38.403149] c7 1827 [<ffffff900858d16c>] f2fs_lookup+0x608/0x774
[ 38.403163] c7 1827 [<ffffff900835eacc>] lookup_slow+0x1e0/0x2cc
[ 38.403177] c7 1827 [<ffffff9008367fe0>] walk_component+0x160/0x520
[ 38.403190] c7 1827 [<ffffff9008369ef4>] path_lookupat+0x110/0x2b4
[ 38.403203] c7 1827 [<ffffff900835dd38>] filename_lookup+0x1d8/0x3a8
[ 38.403216] c7 1827 [<ffffff900835eeb0>] user_path_at_empty+0x54/0x68
[ 38.403229] c7 1827 [<ffffff9008395f44>] SyS_getxattr+0xb4/0x18c
[ 38.403241] c7 1827 [<ffffff9008084200>] el0_svc_naked+0x34/0x38
Signed-off-by: Randall Huang <huangrandall@google.com>
[Jaegeuk Kim: Fix wrong ending boundary]
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r-- | fs/f2fs/xattr.c | 36 | ||||
-rw-r--r-- | fs/f2fs/xattr.h | 2 |
2 files changed, 29 insertions, 9 deletions
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 848a785abe25..e791741d193b 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c | |||
@@ -202,12 +202,17 @@ static inline const struct xattr_handler *f2fs_xattr_handler(int index) | |||
202 | return handler; | 202 | return handler; |
203 | } | 203 | } |
204 | 204 | ||
205 | static struct f2fs_xattr_entry *__find_xattr(void *base_addr, int index, | 205 | static struct f2fs_xattr_entry *__find_xattr(void *base_addr, |
206 | size_t len, const char *name) | 206 | void *last_base_addr, int index, |
207 | size_t len, const char *name) | ||
207 | { | 208 | { |
208 | struct f2fs_xattr_entry *entry; | 209 | struct f2fs_xattr_entry *entry; |
209 | 210 | ||
210 | list_for_each_xattr(entry, base_addr) { | 211 | list_for_each_xattr(entry, base_addr) { |
212 | if ((void *)(entry) + sizeof(__u32) > last_base_addr || | ||
213 | (void *)XATTR_NEXT_ENTRY(entry) > last_base_addr) | ||
214 | return NULL; | ||
215 | |||
211 | if (entry->e_name_index != index) | 216 | if (entry->e_name_index != index) |
212 | continue; | 217 | continue; |
213 | if (entry->e_name_len != len) | 218 | if (entry->e_name_len != len) |
@@ -297,20 +302,22 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage, | |||
297 | const char *name, struct f2fs_xattr_entry **xe, | 302 | const char *name, struct f2fs_xattr_entry **xe, |
298 | void **base_addr, int *base_size) | 303 | void **base_addr, int *base_size) |
299 | { | 304 | { |
300 | void *cur_addr, *txattr_addr, *last_addr = NULL; | 305 | void *cur_addr, *txattr_addr, *last_txattr_addr; |
306 | void *last_addr = NULL; | ||
301 | nid_t xnid = F2FS_I(inode)->i_xattr_nid; | 307 | nid_t xnid = F2FS_I(inode)->i_xattr_nid; |
302 | unsigned int size = xnid ? VALID_XATTR_BLOCK_SIZE : 0; | ||
303 | unsigned int inline_size = inline_xattr_size(inode); | 308 | unsigned int inline_size = inline_xattr_size(inode); |
304 | int err = 0; | 309 | int err = 0; |
305 | 310 | ||
306 | if (!size && !inline_size) | 311 | if (!xnid && !inline_size) |
307 | return -ENODATA; | 312 | return -ENODATA; |
308 | 313 | ||
309 | *base_size = inline_size + size + XATTR_PADDING_SIZE; | 314 | *base_size = XATTR_SIZE(xnid, inode) + XATTR_PADDING_SIZE; |
310 | txattr_addr = f2fs_kzalloc(F2FS_I_SB(inode), *base_size, GFP_NOFS); | 315 | txattr_addr = f2fs_kzalloc(F2FS_I_SB(inode), *base_size, GFP_NOFS); |
311 | if (!txattr_addr) | 316 | if (!txattr_addr) |
312 | return -ENOMEM; | 317 | return -ENOMEM; |
313 | 318 | ||
319 | last_txattr_addr = (void *)txattr_addr + XATTR_SIZE(xnid, inode); | ||
320 | |||
314 | /* read from inline xattr */ | 321 | /* read from inline xattr */ |
315 | if (inline_size) { | 322 | if (inline_size) { |
316 | err = read_inline_xattr(inode, ipage, txattr_addr); | 323 | err = read_inline_xattr(inode, ipage, txattr_addr); |
@@ -337,7 +344,11 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage, | |||
337 | else | 344 | else |
338 | cur_addr = txattr_addr; | 345 | cur_addr = txattr_addr; |
339 | 346 | ||
340 | *xe = __find_xattr(cur_addr, index, len, name); | 347 | *xe = __find_xattr(cur_addr, last_txattr_addr, index, len, name); |
348 | if (!*xe) { | ||
349 | err = -EFAULT; | ||
350 | goto out; | ||
351 | } | ||
341 | check: | 352 | check: |
342 | if (IS_XATTR_LAST_ENTRY(*xe)) { | 353 | if (IS_XATTR_LAST_ENTRY(*xe)) { |
343 | err = -ENODATA; | 354 | err = -ENODATA; |
@@ -581,7 +592,8 @@ static int __f2fs_setxattr(struct inode *inode, int index, | |||
581 | struct page *ipage, int flags) | 592 | struct page *ipage, int flags) |
582 | { | 593 | { |
583 | struct f2fs_xattr_entry *here, *last; | 594 | struct f2fs_xattr_entry *here, *last; |
584 | void *base_addr; | 595 | void *base_addr, *last_base_addr; |
596 | nid_t xnid = F2FS_I(inode)->i_xattr_nid; | ||
585 | int found, newsize; | 597 | int found, newsize; |
586 | size_t len; | 598 | size_t len; |
587 | __u32 new_hsize; | 599 | __u32 new_hsize; |
@@ -605,8 +617,14 @@ static int __f2fs_setxattr(struct inode *inode, int index, | |||
605 | if (error) | 617 | if (error) |
606 | return error; | 618 | return error; |
607 | 619 | ||
620 | last_base_addr = (void *)base_addr + XATTR_SIZE(xnid, inode); | ||
621 | |||
608 | /* find entry with wanted name. */ | 622 | /* find entry with wanted name. */ |
609 | here = __find_xattr(base_addr, index, len, name); | 623 | here = __find_xattr(base_addr, last_base_addr, index, len, name); |
624 | if (!here) { | ||
625 | error = -EFAULT; | ||
626 | goto exit; | ||
627 | } | ||
610 | 628 | ||
611 | found = IS_XATTR_LAST_ENTRY(here) ? 0 : 1; | 629 | found = IS_XATTR_LAST_ENTRY(here) ? 0 : 1; |
612 | 630 | ||
diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h index 9172ee082ca8..a90920e2f949 100644 --- a/fs/f2fs/xattr.h +++ b/fs/f2fs/xattr.h | |||
@@ -71,6 +71,8 @@ struct f2fs_xattr_entry { | |||
71 | entry = XATTR_NEXT_ENTRY(entry)) | 71 | entry = XATTR_NEXT_ENTRY(entry)) |
72 | #define VALID_XATTR_BLOCK_SIZE (PAGE_SIZE - sizeof(struct node_footer)) | 72 | #define VALID_XATTR_BLOCK_SIZE (PAGE_SIZE - sizeof(struct node_footer)) |
73 | #define XATTR_PADDING_SIZE (sizeof(__u32)) | 73 | #define XATTR_PADDING_SIZE (sizeof(__u32)) |
74 | #define XATTR_SIZE(x,i) (((x) ? VALID_XATTR_BLOCK_SIZE : 0) + \ | ||
75 | (inline_xattr_size(i))) | ||
74 | #define MIN_OFFSET(i) XATTR_ALIGN(inline_xattr_size(i) + \ | 76 | #define MIN_OFFSET(i) XATTR_ALIGN(inline_xattr_size(i) + \ |
75 | VALID_XATTR_BLOCK_SIZE) | 77 | VALID_XATTR_BLOCK_SIZE) |
76 | 78 | ||