From: Chao Yu <chao(a)kernel.org>
stable inclusion
from stable-v6.6.47
commit ae00e6536a2dd54b64b39e9a39548870cf835745
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAMMMF
CVE: CVE-2024-44942
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id…
--------------------------------
[ Upstream commit fc01008c92f40015aeeced94750855a7111b6929 ]
syzbot reports a f2fs bug as below:
------------[ cut here ]------------
kernel BUG at fs/f2fs/inline.c:258!
CPU: 1 PID: 34 Comm: kworker/u8:2 Not tainted 6.9.0-rc6-syzkaller-00012-g9e4bc4bcae01 #0
RIP: 0010:f2fs_write_inline_data+0x781/0x790 fs/f2fs/inline.c:258
Call Trace:
f2fs_write_single_data_page+0xb65/0x1d60 fs/f2fs/data.c:2834
f2fs_write_cache_pages fs/f2fs/data.c:3133 [inline]
__f2fs_write_data_pages fs/f2fs/data.c:3288 [inline]
f2fs_write_data_pages+0x1efe/0x3a90 fs/f2fs/data.c:3315
do_writepages+0x35b/0x870 mm/page-writeback.c:2612
__writeback_single_inode+0x165/0x10b0 fs/fs-writeback.c:1650
writeback_sb_inodes+0x905/0x1260 fs/fs-writeback.c:1941
wb_writeback+0x457/0xce0 fs/fs-writeback.c:2117
wb_do_writeback fs/fs-writeback.c:2264 [inline]
wb_workfn+0x410/0x1090 fs/fs-writeback.c:2304
process_one_work kernel/workqueue.c:3254 [inline]
process_scheduled_works+0xa12/0x17c0 kernel/workqueue.c:3335
worker_thread+0x86d/0xd70 kernel/workqueue.c:3416
kthread+0x2f2/0x390 kernel/kthread.c:388
ret_from_fork+0x4d/0x80 arch/x86/kernel/process.c:147
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
The root cause is: inline_data inode can be fuzzed, so that there may
be valid blkaddr in its direct node, once f2fs triggers background GC
to migrate the block, it will hit f2fs_bug_on() during dirty page
writeback.
Let's add sanity check on F2FS_INLINE_DATA flag in inode during GC,
so that, it can forbid migrating inline_data inode's data block for
fixing.
Reported-by: syzbot+848062ba19c8782ca5c8(a)syzkaller.appspotmail.com
Closes: https://lore.kernel.org/linux-f2fs-devel/000000000000d103ce06174d7ec3@googl…
Signed-off-by: Chao Yu <chao(a)kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org>
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
Conflicts:
fs/f2fs/gc.c
[Code logic conflict, f2fs_info_ratelimited was introduced
since commit b1c9d3f833ba ("f2fs: support printk_ratelimited() in f2fs_printk()"), so
replace it with f2fs_err, and f2fs_gc_pinned_control was introduced
since commit 71419129625a ("f2fs: give priority to select unpinned section
for foreground GC"), ingore it.]
Signed-off-by: Cui GaoSheng <cuigaosheng1(a)huawei.com>
---
fs/f2fs/gc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 6e75437a6a2e..9bd64b8c2e92 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1450,6 +1450,16 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
continue;
}
+ if (f2fs_has_inline_data(inode)) {
+ iput(inode);
+ set_sbi_flag(sbi, SBI_NEED_FSCK);
+ f2fs_err(sbi,
+ "inode %lx has both inline_data flag and "
+ "data block, nid=%u, ofs_in_node=%u",
+ inode->i_ino, dni.nid, ofs_in_node);
+ continue;
+ }
+
if (!down_write_trylock(
&F2FS_I(inode)->i_gc_rwsem[WRITE])) {
iput(inode);
--
2.34.1
tree: https://gitee.com/openeuler/kernel.git OLK-5.10
head: b7bed6628b750ffd687d1da0a170dece4b0c08bd
commit: a398c3637a33330c134f067e06df959550d44f7b [27064/30000] drivers: initial support for rnpgbe drivers from Mucse Technology
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20240903/202409031257.Y7C0PYH5-lkp@…)
compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240903/202409031257.Y7C0PYH5-lkp@…)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp(a)intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409031257.Y7C0PYH5-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:2353:6: warning: variable 'cleaned_total' set but not used [-Wunused-but-set-variable]
2353 | int cleaned_total = 0;
| ^
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:2899:6: warning: variable 'rxctrl' set but not used [-Wunused-but-set-variable]
2899 | u32 rxctrl = 0, dma_axi_ctl;
| ^
>> drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:4324:6: warning: variable 'err' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
4324 | if (netif_running(netdev))
| ^~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:4329:6: note: uninitialized use occurs here
4329 | if (err)
| ^~~
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:4324:2: note: remove the 'if' if its condition is always true
4324 | if (netif_running(netdev))
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
4325 | err = rnpgbe_open(netdev);
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:4318:9: note: initialize the variable 'err' to silence this warning
4318 | u32 err;
| ^
| = 0
drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c:6160:29: warning: unused function 'rnpgbe_tso_features' [-Wunused-function]
6160 | static inline unsigned long rnpgbe_tso_features(struct rnpgbe_hw *hw)
| ^~~~~~~~~~~~~~~~~~~
4 warnings generated.
vim +4324 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c
4309
4310 /**
4311 * rnpgbe_thaw - un-quiesce the device
4312 * @dev: The port's netdev
4313 */
4314 static int rnpgbe_thaw(struct device *dev)
4315 {
4316 struct rnpgbe_adapter *adapter = pci_get_drvdata(to_pci_dev(dev));
4317 struct net_device *netdev = adapter->netdev;
4318 u32 err;
4319
4320 rnpgbe_set_interrupt_capability(adapter);
4321 register_mbx_irq(adapter);
4322
4323 rtnl_lock();
> 4324 if (netif_running(netdev))
4325 err = rnpgbe_open(netdev);
4326
4327 rtnl_unlock();
4328
4329 if (err)
4330 return err;
4331 netif_device_attach(netdev);
4332
4333 return 0;
4334 }
4335
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki