driver core: Make dev_err_probe() silent for -ENOMEM
Sasha Levin
maintainerPATCH 1/3 driver core: Make dev_err_probe() silent for -ENOMEM
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 2f3cfd2f4b7cf3026fe6b9b2a5320cc18f4c184e ]
For an out-of-memory error there should be no additional output. Adapt dev_err_probe() to not emit the error message when err is -ENOMEM. This simplifies handling errors that might among others be -ENOMEM.
--- drivers/base/core.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/base/core.c +14 -3
@@ -4314,11 +4314,22 @@ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; -if (err != -EPROBE_DEFER ) { -dev_err (dev,"error %pe: %pV" ,ERR_PTR (err), &vaf); - }else { +switch (err) { +case -EPROBE_DEFER :device_set_deferred_probe_reason (dev, &vaf);dev_dbg (dev,"error %pe: %pV" ,ERR_PTR (err), &vaf); +break ; + +case -ENOMEM : +/* +* We don't print anything on -ENOMEM, there is already enough +* output. +*/ +break ; + +default : +dev_err (dev,"error %pe: %pV" ,ERR_PTR (err), &vaf); +break ; }va_end (args);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/3 jfs: fix null ptr deref in dtInsertEntry
From: Edward Adam Davis <[email protected]>
[ Upstream commit ce6dede912f064a855acf6f04a04cbb2c25b8c8c ]
[syzbot reported]
general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN PTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 0 PID: 5061 Comm: syz-executor404 Not tainted 6.8.0-syzkaller-08951-gfe46a7dd189e #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024 RIP: 0010:dtInsertEntry+0xd0c/0x1780 fs/jfs/jfs_dtree.c:3713
...
[Analyze]
In dtInsertEntry(), when the pointer h has the same value as p, after writing name in UniStrncpy_to_le(), p->header.flag will be cleared. This will cause the previously true judgment "p->header.flag & BT-LEAF" to change to no after writing the name operation, this leads to entering an incorrect branch and accessing the uninitialized object ih when judging this condition for the second time.
[Fix]
After got the page, check freelist first, if freelist == 0 then exit dtInsert() and return -EINVAL.
--- fs/jfs/jfs_dtree.c | 2 ++ 1 file changed, 2 insertions(+)
fs/jfs/jfs_dtree.c +2 -0
@@ -834,6 +834,8 @@ int dtInsert(tid_t tid, struct inode *ip,* the full page. */ DT_GETSEARCH (ip, btstack->top, bn, mp, p, index); +if (p->header.freelist ==0 ) +return -EINVAL ;/* * insert entry for new key
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/3 jfs: Fix shift-out-of-bounds in dbDiscardAG
In reply to Sasha LevinFrom: Pei Li <[email protected]>
[ Upstream commit 7063b80268e2593e58bee8a8d709c2f3ff93e2f2 ]
When searching for the next smaller log2 block, BLKSTOL2() returned 0, causing shift exponent -1 to be negative.
This patch fixes the issue by exiting the loop directly when negative shift is found.
--- fs/jfs/jfs_dmap.c | 2 ++ 1 file changed, 2 insertions(+)
fs/jfs/jfs_dmap.c +2 -0
@@ -1694,6 +1694,8 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen) }else if (rc == -ENOSPC ) {/* search for next smaller log2 block */ l2nb =BLKSTOL2 (nblocks) -1 ; +if (unlikely (l2nb <0 )) +break ; nblocks =1LL << l2nb; }else {/* Trim any already allocated blocks */
Signature · 1 line
2.43.0