UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

f2fs: Add inline to f2fs_build_fault_attr() stub 

[ Upstream commit 0d8968287a1cf7b03d07387dc871de3861b9f6b9 ]

Fix CVE: CVE-2024-42160

When building without CONFIG_F2FS_FAULT_INJECTION, there is a warning
from each file that includes f2fs.h because the stub for
f2fs_build_fault_attr() is missing inline:

  In file included from fs/f2fs/segment.c:21:
  fs/f2fs/f2fs.h:4605:12: warning: 'f2fs_build_fault_attr' defined but not used [-Wunused-function]
   4605 | static int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
        |            ^~~~~~~~~~~~~~~~~~~~~

Add the missing inline to resolve all of the warnings for this
configuration.

Fixes: 4ed886b187f4 ("f2fs: check validation of fault attrs in f2fs_build_fault_attr()")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
This commit is contained in:
Nathan Chancellor 2024-05-13 08:40:27 -07:00 committed by Jianping Liu
parent 6c74355d9c
commit 0659a1550c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/f2fs/f2fs.h
View File

@ -3765,8 +3765,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode,
extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate, extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
unsigned long type); unsigned long type);
#else #else
static int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate, static inline int f2fs_build_fault_attr(struct f2fs_sb_info *sbi,
unsigned long type) unsigned long rate, unsigned long type)
{ {
return 0; return 0;
} }