Commit Graph

961 Commits

Author SHA1 Message Date
Dylan Chang
a84478b3a4 tools: fix file too large causing overflow
fibmap: Fix file too large causing file_pos overflow

fibmap show file_pos with incorrectly value when passing a large file.

Before:

----------------file info-------------------
/data/media/0/data1 :
--------------------------------------------
dev       [254:18]
ino       [0x    4db1 : 19889]
mode      [0x    81b0 : 33200]
nlink     [0x       1 : 1]
uid       [0x    280e : 10254]
gid       [0x     3ff : 1023]
size      [0x1b3dca314 : 7312548628]
blksize   [0x    1000 : 4096]
blocks    [0x  da2530 : 14296368]
--------------------------------------------

file_pos   start_blk     end_blk        blks
       0     3197602     3198463         862
 3530752     3197509     3197509           1
 3534848     3197557     3197578          22
 3624960     3198464     3396701      198238
815607808     3396703     3632480      235778
1781354496     3632482     3652095       19614
1861693440     3396702     3396702           1
1861697536     3632481     3632481           1
1861701632     1514948     1514948           1
1861705728     1518774     1518774           1
1861709824     2543104     2543125          22
...
1862111232     2457813     2457813           1
1862115328     3652096     3878168      226073
-1506856960     3878170     4133725      255556
-460099584     1510048     1510052           5

Patched:
----------------file info-------------------
/data/media/0/data1 :
--------------------------------------------
dev       [254:18]
ino       [0x    4db1 : 19889]
mode      [0x    81b0 : 33200]
nlink     [0x       1 : 1]
uid       [0x    280e : 10254]
gid       [0x     3ff : 1023]
size      [0x1b3dca314 : 7312548628]
blksize   [0x    1000 : 4096]
blocks    [0x  da2530 : 14296368]
--------------------------------------------

file_pos   start_blk     end_blk        blks
       0     3197602     3198463         862
 3530752     3197509     3197509           1
 3534848     3197557     3197578          22
 3624960     3198464     3396701      198238
815607808     3396703     3632480      235778
1781354496     3632482     3652095       19614
1861693440     3396702     3396702           1
1861697536     3632481     3632481           1
1861701632     1514948     1514948           1
1861705728     1518774     1518774           1
1861709824     2543104     2543125          22
...
1862111232     2457813     2457813           1
1862115328     3652096     3878168      226073
2788110336     3878170     4133725      255556
3834867712     1510048     1510052           5

Signed-off-by: Dylan Chang <dylan.chang@oneplus.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Yufen Yu
6cdc192294 dump.f2fs: add -I nid to dump inode by scan full disk
Usage:
	dump.f2fs -I [inode nid] /dev/sda

This feature can be useful for some bugs caused by system crash.
We not only need dump current valid node page, but alse the history
data in disk, which can give some clues for status change of the inode.

Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Reviewed-by: Chao Yu <chao@kernel.org>
[Jaegeuk Kim: fix build error]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
2205680313 android_config: add time headers
This allows f2fs_io report latency.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
839483e940 Check fallthrough in mount.h for Mac
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/usr/include/os/base.h:128:23: error: missing ')' after 'do'
                      ^~~~~~~~~~~
external/f2fs-tools/include/f2fs_fs.h:81:24: note: expanded from macro 'fallthrough'
                    ~~ ^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/usr/include/os/base.h:128:22: note: to match this '('

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
7485348af8 avoid unnecessary function
libf2fs.c:883:12: warning: unused function 'is_power_of_2' [-Wunused-function]

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Martin Stjernholm
163b23d5ac Fix dependencies on linux/blkzoned.h when using Bionic.
This reverts commit adcec10b4dee ("Support zoned device if libc exists).

Signed-off-by: Martin Stjernholm <mast@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
77aa322fb7 Remove unnecessary config.h
Instead, we should use <config.h> generated by configure.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
72de6cc108 libzone: remove duplicate header
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
172234a711 Support zoned device if libc exists
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
2bff50e020 mkfs.f2fs: fix typo
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
ae57c32f13 mkfs.f2fs: split unused parameter
external/f2fs-tools/mkfs/f2fs_format_utils.c:51:28: error: unused parameter 'i' [-Werror,-Wunused-parameter]

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
d0e53cc8aa f2fs-tools: do not use SG_IO in Android
Android security team does not allow to use SG_IO.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
90a36f3918 f2fs-tools: move android_config before defining them
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
4b9ae54c2f f2fscrypt: adjust config file first
We need to get the definitions first.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
Jaegeuk Kim
e4ef43a7fb android_config: add missing uuid library
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2024-04-15 11:29:16 +08:00
openharmony_ci
39c8bb9f31
!40 优化syscall 调用,提升fsck 读写性能
Merge pull request !40 from fangzhou/syscall_opt
2024-03-28 06:41:37 +00:00
fangzhou
684c77989b Use pread64/pwrite64 syscall optimize fsck performance
Issue: https://gitee.com/openharmony/third_party_f2fs-tools/issues/I9CA01

Signed-off-by: Lu Fangzhou <lufangzhou1@huawei.com>
2024-03-28 12:21:42 +08:00
openharmony_ci
be08214cd8
!39 fix: f2fs_do_mount维测增强
Merge pull request !39 from nieben/f2fs_do_mount-dfx
2024-03-21 07:28:59 +00:00
nieben
f505165a60 f2fs_do_mount-dfx
Signed-off-by: nieben <nieben1@huawei.com>
2024-03-21 10:39:24 +08:00
openharmony_ci
e3bf3a6c13
!38 第三方f2fs-tools部件编译整改
Merge pull request !38 from tongkai0808fh/master
2024-03-19 08:51:09 +00:00
tongkai0808fh
7a530965a2
修改inner_kits配置
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
2024-03-19 06:34:01 +00:00
openharmony_ci
22d5d3737b
!35 第三方f2fs-tools部件独立编译整改
Merge pull request !35 from tongkai0808fh/master
2024-02-29 11:37:25 +00:00
tongkai0808fh
c3bc6b2b82
修改bundle.json的子部件配置信息
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
2024-02-29 09:05:19 +00:00
openharmony_ci
188ac39e7f
!34 第三方f2fs部件bundle.json文件更新
Merge pull request !34 from tongkai0808fh/master
2024-02-29 06:40:30 +00:00
tongkai0808fh
f0c868daca
bundle.json文件加入mkfs.f2fs子组件
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
2024-02-29 03:19:08 +00:00
openharmony_ci
90d4a99e83
!32 第三方分f2fs-tools部件独立编译整改
Merge pull request !32 from tongkai0808fh/master
2024-02-21 03:52:17 +00:00
tongkai0808fh
ef6ee84a1c
第三方f2fs-tools部件独立编译整改
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
2024-02-21 02:51:31 +00:00
openharmony_ci
40c355d810
!31 增加开源声明文件
Merge pull request !31 from wangmingxuan/master
2024-01-25 03:09:17 +00:00
psycho
07937972a5 增加开源声明文件
Signed-off-by: psycho <wangmingxuan6@h-partners.com>
2024-01-25 10:30:22 +08:00
openharmony_ci
d4b6da9d85
!30 f2fs-tools开源信息与手机体现不一致
Merge pull request !30 from wangmingxuan/master
2024-01-22 11:12:51 +00:00
psycho
32b532225f 开源文件更新
Signed-off-by: psycho <wangmingxuan6@h-partners.com>
2024-01-22 14:12:59 +08:00
openharmony_ci
fcc0fd642f
!27 resize.f2fs支持传参使能projquota/casefold特性
Merge pull request !27 from 范威威/master
2023-09-05 04:52:12 +00:00
18682127009
852cbb805e Fix: resize.f2fs enable projquota/casefold
Signed-off-by: 18682127009 <fanww92@126.com>
2023-09-04 19:34:25 +08:00
openharmony_ci
f19090cb94
!24 f2fs-tools构建规范化整改
Merge pull request !24 from yangjingbo/f2fs-tools_rectify_0614
2023-06-25 08:36:01 +00:00
y30045862
2ba6b2b207 f2fs-tools构建规范化整改
Signed-off-by: yangjingbo10 <yangjingbo10@huawei.com>

Change-Id: I1aae1cb27162594dae1e395f46fcf0833750e6d0
2023-06-21 09:25:04 +08:00
openharmony_ci
b809e65933
!23 fix e2fsprogs compile in f2fs_tools
Merge pull request !23 from 张文迪/master
2023-06-05 01:44:05 +00:00
张文迪
9fef819eb4 fix e2fsprogs
Signed-off-by: 张文迪 <zhangwendi3@huawei.com>
2023-06-03 17:03:53 +08:00
openharmony_ci
9cf86194f2
!22 fix compile in f2fstools
Merge pull request !22 from 张文迪/master
2023-06-02 01:37:43 +00:00
张文迪
b08c917ed4 fix compile
Signed-off-by: 张文迪 <zhangwendi3@huawei.com>
2023-06-01 20:39:25 +08:00
openharmony_ci
349fedd3f1
!21 adapt the modification of e2fsprog switching to OpenEuler
Merge pull request !21 from 张文迪/master
2023-05-24 02:13:19 +00:00
张文迪
461b8536e1 adapt the modification of e2fsprog switching to OpenEuler
Signed-off-by: 张文迪 <zhangwendi3@huawei.com>
2023-05-20 16:59:34 +08:00
openharmony_ci
fb61e5453d
!20 tools升级v1.14==>v1.15
Merge pull request !20 from 董森浩/master
2023-05-11 08:45:46 +00:00
dongsenhao
61cee5700e 适配build.gn
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-14 16:51:10 +08:00
Jaegeuk Kim
74d4671ba2 f2fs-tools: upgrade version 1.15.0
commit 64f2596142800c215cb40a658ebd5793ed37c936
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:52 +08:00
Jaegeuk Kim
3eb1991f44 f2fs-tools: build silently
commit d9d5b11413bd40dbd31a2c64750565d508a180b3
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:52 +08:00
Jaegeuk Kim
1959950d86 fsck.f2fs: fix broken file_map output
commit 299c0b566ad71f0a9ca0cc359d1d174de9068294
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

The new fsck progress should not be used for file_map.

Reported-by: Michael Benedict <michaelbenedicttjahya@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:52 +08:00
Jaegeuk Kim
b844b4b34c f2fs-tools: show segment/section layout correctly
commit 3af62be37cd2407da1f44396cd9390bd560ed01f
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

This patch fixes wrong segment/section print-outs.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:52 +08:00
Jaegeuk Kim
43aa4d3b7b f2fs-tools: use android config only if there's no config.h
commit 4d9c009c343ce1247d9df583b22110f348201b3d
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:51 +08:00
Chao Yu
5ddd2c6685 dump.f2fs: compress: fix dstlen of LZ4_compress_fast_extState()
commit 0b9b89fda2e9fbaf17a11fa15332e7ae95cf5261
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Compressed cluster content includes compress cluster header, so
calculation of dstlen parameter in LZ4_compress_fast_extState()
should consider this design, otherwise compressed data may overflow
destination buffer during compression.

Signed-off-by: Chao Yu <chao.yu@oppo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:51 +08:00
Jaegeuk Kim
fbbd3511f3 mkfs.f2fs: check uuid library
commit eee3969d7dcf3be9c3b831d993fcf49f55855a35
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
2023-04-13 14:13:51 +08:00