From: Greg Kroah-Hartman Date: Thu, 25 Jul 2024 12:47:32 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v4.19.319~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58b2ed17fca6d1e8df8f29171a4bf42698ba9d85;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch alsa-hda-tas2781-add-new-quirk-for-lenovo-hera2-laptop.patch drm-amdgpu-fix-signedness-bug-in-sdma_v4_0_process_trap_irq.patch f2fs-avoid-dead-loop-in-f2fs_issue_checkpoint.patch fs-ntfs3-add-a-check-for-attr_names-and-oatbl.patch fs-ntfs3-validate-ff-offset.patch jfs-don-t-walk-off-the-end-of-ealist.patch ocfs2-add-bounds-checking-to-ocfs2_check_dir_entry.patch s390-mm-fix-vm_fault_hwpoison-handling-in-do_exception.patch series usb-gadget-midi2-fix-incorrect-default-midi2-protocol-setup.patch --- diff --git a/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch b/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch new file mode 100644 index 00000000000..56a8be1b309 --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch @@ -0,0 +1,31 @@ +From 8fc1e8b230771442133d5cf5fa4313277aa2bb8b Mon Sep 17 00:00:00 2001 +From: Edson Juliano Drosdeck +Date: Fri, 12 Jul 2024 15:06:42 -0300 +Subject: ALSA: hda/realtek: Enable headset mic on Positivo SU C1400 + +From: Edson Juliano Drosdeck + +commit 8fc1e8b230771442133d5cf5fa4313277aa2bb8b upstream. + +Positivo SU C1400 is equipped with ALC256, and it needs +ALC269_FIXUP_ASPIRE_HEADSET_MIC quirk to make its headset mic work. + +Signed-off-by: Edson Juliano Drosdeck +Cc: +Link: https://patch.msgid.link/20240712180642.22564-1-edson.drosdeck@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9928,6 +9928,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC), + SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE), + SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE), ++ SND_PCI_QUIRK(0x10ec, 0x119e, "Positivo SU C1400", ALC269_FIXUP_ASPIRE_HEADSET_MIC), + SND_PCI_QUIRK(0x10ec, 0x11bc, "VAIO VJFE-IL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x10ec, 0x1230, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), + SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), diff --git a/queue-6.1/alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch b/queue-6.1/alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch new file mode 100644 index 00000000000..c18a82bf73f --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch @@ -0,0 +1,32 @@ +From d7063c08738573fc2f3296da6d31a22fa8aa843a Mon Sep 17 00:00:00 2001 +From: Seunghun Han +Date: Thu, 18 Jul 2024 17:09:08 +0900 +Subject: ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360 + +From: Seunghun Han + +commit d7063c08738573fc2f3296da6d31a22fa8aa843a upstream. + +Samsung Galaxy Book Pro 360 (13" 2022 NT935QDB-KC71S) with codec SSID +144d:c1a4 requires the same workaround to enable the speaker amp +as other Samsung models with the ALC298 codec. + +Signed-off-by: Seunghun Han +Cc: +Link: https://patch.msgid.link/20240718080908.8677-1-kkamagui@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9942,6 +9942,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP), ++ SND_PCI_QUIRK(0x144d, 0xc1a4, "Samsung Galaxy Book Pro 360 (NT935QBD)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc1a6, "Samsung Galaxy Book Pro 360 (NP930QBD)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8), + SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP), diff --git a/queue-6.1/drm-amdgpu-fix-signedness-bug-in-sdma_v4_0_process_trap_irq.patch b/queue-6.1/drm-amdgpu-fix-signedness-bug-in-sdma_v4_0_process_trap_irq.patch new file mode 100644 index 00000000000..10c8fc7cb7c --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-signedness-bug-in-sdma_v4_0_process_trap_irq.patch @@ -0,0 +1,32 @@ +From 6769a23697f17f9bf9365ca8ed62fe37e361a05a Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Sun, 28 Apr 2024 15:57:00 +0300 +Subject: drm/amdgpu: Fix signedness bug in sdma_v4_0_process_trap_irq() + +From: Dan Carpenter + +commit 6769a23697f17f9bf9365ca8ed62fe37e361a05a upstream. + +The "instance" variable needs to be signed for the error handling to work. + +Fixes: 8b2faf1a4f3b ("drm/amdgpu: add error handle to avoid out-of-bounds") +Reviewed-by: Bob Zhou +Signed-off-by: Dan Carpenter +Signed-off-by: Alex Deucher +Cc: Siddh Raman Pant +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -2045,7 +2045,7 @@ static int sdma_v4_0_process_trap_irq(st + struct amdgpu_irq_src *source, + struct amdgpu_iv_entry *entry) + { +- uint32_t instance; ++ int instance; + + DRM_DEBUG("IH: SDMA trap\n"); + instance = sdma_v4_0_irq_id_to_seq(entry->client_id); diff --git a/queue-6.1/f2fs-avoid-dead-loop-in-f2fs_issue_checkpoint.patch b/queue-6.1/f2fs-avoid-dead-loop-in-f2fs_issue_checkpoint.patch new file mode 100644 index 00000000000..15fcedb1984 --- /dev/null +++ b/queue-6.1/f2fs-avoid-dead-loop-in-f2fs_issue_checkpoint.patch @@ -0,0 +1,97 @@ +From 5079e1c0c879311668b77075de3e701869804adf Mon Sep 17 00:00:00 2001 +From: Chao Yu +Date: Fri, 2 Jun 2023 16:36:05 +0800 +Subject: f2fs: avoid dead loop in f2fs_issue_checkpoint() + +From: Chao Yu + +commit 5079e1c0c879311668b77075de3e701869804adf upstream. + +generic/082 reports a bug as below: + +__schedule+0x332/0xf60 +schedule+0x6f/0xf0 +schedule_timeout+0x23b/0x2a0 +wait_for_completion+0x8f/0x140 +f2fs_issue_checkpoint+0xfe/0x1b0 +f2fs_sync_fs+0x9d/0xb0 +sync_filesystem+0x87/0xb0 +dquot_load_quota_sb+0x41b/0x460 +dquot_load_quota_inode+0xa5/0x130 +dquot_quota_on+0x4b/0x60 +f2fs_quota_on+0xe3/0x1b0 +do_quotactl+0x483/0x700 +__x64_sys_quotactl+0x15c/0x310 +do_syscall_64+0x3f/0x90 +entry_SYSCALL_64_after_hwframe+0x72/0xdc + +The root casue is race case as below: + +Thread A Kworker IRQ +- write() +: write data to quota.user file + + - writepages + - f2fs_submit_page_write + - __is_cp_guaranteed return false + - inc_page_count(F2FS_WB_DATA) + - submit_bio +- quotactl(Q_QUOTAON) + - f2fs_quota_on + - dquot_quota_on + - dquot_load_quota_inode + - vfs_setup_quota_inode + : inode->i_flags |= S_NOQUOTA + - f2fs_write_end_io + - __is_cp_guaranteed return true + - dec_page_count(F2FS_WB_CP_DATA) + - dquot_load_quota_sb + - f2fs_sync_fs + - f2fs_issue_checkpoint + - do_checkpoint + - f2fs_wait_on_all_pages(F2FS_WB_CP_DATA) + : loop due to F2FS_WB_CP_DATA count is negative + +Calling filemap_fdatawrite() and filemap_fdatawait() to keep all data +clean before quota file setup. + +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sergio González Collado +Reported-by: syzbot+d0ab8746c920a592aeab@syzkaller.appspotmail.com +Signed-off-by: Greg Kroah-Hartman +--- + fs/f2fs/super.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -2824,15 +2824,26 @@ static int f2fs_quota_on(struct super_bl + return -EBUSY; + } + ++ if (path->dentry->d_sb != sb) ++ return -EXDEV; ++ + err = f2fs_quota_sync(sb, type); + if (err) + return err; + +- err = dquot_quota_on(sb, type, format_id, path); ++ inode = d_inode(path->dentry); ++ ++ err = filemap_fdatawrite(inode->i_mapping); + if (err) + return err; + +- inode = d_inode(path->dentry); ++ err = filemap_fdatawait(inode->i_mapping); ++ if (err) ++ return err; ++ ++ err = dquot_quota_on(sb, type, format_id, path); ++ if (err) ++ return err; + + inode_lock(inode); + F2FS_I(inode)->i_flags |= F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL; diff --git a/queue-6.1/fs-ntfs3-validate-ff-offset.patch b/queue-6.1/fs-ntfs3-validate-ff-offset.patch new file mode 100644 index 00000000000..c66523f89d5 --- /dev/null +++ b/queue-6.1/fs-ntfs3-validate-ff-offset.patch @@ -0,0 +1,43 @@ +From 50c47879650b4c97836a0086632b3a2e300b0f06 Mon Sep 17 00:00:00 2001 +From: lei lu +Date: Wed, 29 May 2024 02:52:22 +0800 +Subject: fs/ntfs3: Validate ff offset + +From: lei lu + +commit 50c47879650b4c97836a0086632b3a2e300b0f06 upstream. + +This adds sanity checks for ff offset. There is a check +on rt->first_free at first, but walking through by ff +without any check. If the second ff is a large offset. +We may encounter an out-of-bound read. + +Signed-off-by: lei lu +Signed-off-by: Konstantin Komarov +Signed-off-by: Greg Kroah-Hartman +--- + fs/ntfs3/fslog.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/fs/ntfs3/fslog.c ++++ b/fs/ntfs3/fslog.c +@@ -724,7 +724,8 @@ static bool check_rstbl(const struct RES + + if (!rsize || rsize > bytes || + rsize + sizeof(struct RESTART_TABLE) > bytes || bytes < ts || +- le16_to_cpu(rt->total) > ne || ff > ts || lf > ts || ++ le16_to_cpu(rt->total) > ne || ++ ff > ts - sizeof(__le32) || lf > ts - sizeof(__le32) || + (ff && ff < sizeof(struct RESTART_TABLE)) || + (lf && lf < sizeof(struct RESTART_TABLE))) { + return false; +@@ -754,6 +755,9 @@ static bool check_rstbl(const struct RES + return false; + + off = le32_to_cpu(*(__le32 *)Add2Ptr(rt, off)); ++ ++ if (off > ts - sizeof(__le32)) ++ return false; + } + + return true; diff --git a/queue-6.1/jfs-don-t-walk-off-the-end-of-ealist.patch b/queue-6.1/jfs-don-t-walk-off-the-end-of-ealist.patch new file mode 100644 index 00000000000..c7266f95fef --- /dev/null +++ b/queue-6.1/jfs-don-t-walk-off-the-end-of-ealist.patch @@ -0,0 +1,83 @@ +From d0fa70aca54c8643248e89061da23752506ec0d4 Mon Sep 17 00:00:00 2001 +From: lei lu +Date: Wed, 29 May 2024 02:30:40 +0800 +Subject: jfs: don't walk off the end of ealist + +From: lei lu + +commit d0fa70aca54c8643248e89061da23752506ec0d4 upstream. + +Add a check before visiting the members of ea to +make sure each ea stays within the ealist. + +Signed-off-by: lei lu +Signed-off-by: Dave Kleikamp +Signed-off-by: Greg Kroah-Hartman +--- + fs/jfs/xattr.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +--- a/fs/jfs/xattr.c ++++ b/fs/jfs/xattr.c +@@ -797,7 +797,7 @@ ssize_t __jfs_getxattr(struct inode *ino + size_t buf_size) + { + struct jfs_ea_list *ealist; +- struct jfs_ea *ea; ++ struct jfs_ea *ea, *ealist_end; + struct ea_buffer ea_buf; + int xattr_size; + ssize_t size; +@@ -817,9 +817,16 @@ ssize_t __jfs_getxattr(struct inode *ino + goto not_found; + + ealist = (struct jfs_ea_list *) ea_buf.xattr; ++ ealist_end = END_EALIST(ealist); + + /* Find the named attribute */ +- for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) ++ for (ea = FIRST_EA(ealist); ea < ealist_end; ea = NEXT_EA(ea)) { ++ if (unlikely(ea + 1 > ealist_end) || ++ unlikely(NEXT_EA(ea) > ealist_end)) { ++ size = -EUCLEAN; ++ goto release; ++ } ++ + if ((namelen == ea->namelen) && + memcmp(name, ea->name, namelen) == 0) { + /* Found it */ +@@ -834,6 +841,7 @@ ssize_t __jfs_getxattr(struct inode *ino + memcpy(data, value, size); + goto release; + } ++ } + not_found: + size = -ENODATA; + release: +@@ -861,7 +869,7 @@ ssize_t jfs_listxattr(struct dentry * de + ssize_t size = 0; + int xattr_size; + struct jfs_ea_list *ealist; +- struct jfs_ea *ea; ++ struct jfs_ea *ea, *ealist_end; + struct ea_buffer ea_buf; + + down_read(&JFS_IP(inode)->xattr_sem); +@@ -876,9 +884,16 @@ ssize_t jfs_listxattr(struct dentry * de + goto release; + + ealist = (struct jfs_ea_list *) ea_buf.xattr; ++ ealist_end = END_EALIST(ealist); + + /* compute required size of list */ +- for (ea = FIRST_EA(ealist); ea < END_EALIST(ealist); ea = NEXT_EA(ea)) { ++ for (ea = FIRST_EA(ealist); ea < ealist_end; ea = NEXT_EA(ea)) { ++ if (unlikely(ea + 1 > ealist_end) || ++ unlikely(NEXT_EA(ea) > ealist_end)) { ++ size = -EUCLEAN; ++ goto release; ++ } ++ + if (can_list(ea)) + size += name_size(ea) + 1; + } diff --git a/queue-6.1/ocfs2-add-bounds-checking-to-ocfs2_check_dir_entry.patch b/queue-6.1/ocfs2-add-bounds-checking-to-ocfs2_check_dir_entry.patch new file mode 100644 index 00000000000..6c940c8b432 --- /dev/null +++ b/queue-6.1/ocfs2-add-bounds-checking-to-ocfs2_check_dir_entry.patch @@ -0,0 +1,163 @@ +From 255547c6bb8940a97eea94ef9d464ea5967763fb Mon Sep 17 00:00:00 2001 +From: lei lu +Date: Wed, 26 Jun 2024 18:44:33 +0800 +Subject: ocfs2: add bounds checking to ocfs2_check_dir_entry() + +From: lei lu + +commit 255547c6bb8940a97eea94ef9d464ea5967763fb upstream. + +This adds sanity checks for ocfs2_dir_entry to make sure all members of +ocfs2_dir_entry don't stray beyond valid memory region. + +Link: https://lkml.kernel.org/r/20240626104433.163270-1-llfamsec@gmail.com +Signed-off-by: lei lu +Reviewed-by: Heming Zhao +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ocfs2/dir.c | 46 +++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 17 deletions(-) + +--- a/fs/ocfs2/dir.c ++++ b/fs/ocfs2/dir.c +@@ -294,13 +294,16 @@ out: + * bh passed here can be an inode block or a dir data block, depending + * on the inode inline data flag. + */ +-static int ocfs2_check_dir_entry(struct inode * dir, +- struct ocfs2_dir_entry * de, +- struct buffer_head * bh, ++static int ocfs2_check_dir_entry(struct inode *dir, ++ struct ocfs2_dir_entry *de, ++ struct buffer_head *bh, ++ char *buf, ++ unsigned int size, + unsigned long offset) + { + const char *error_msg = NULL; + const int rlen = le16_to_cpu(de->rec_len); ++ const unsigned long next_offset = ((char *) de - buf) + rlen; + + if (unlikely(rlen < OCFS2_DIR_REC_LEN(1))) + error_msg = "rec_len is smaller than minimal"; +@@ -308,9 +311,11 @@ static int ocfs2_check_dir_entry(struct + error_msg = "rec_len % 4 != 0"; + else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len))) + error_msg = "rec_len is too small for name_len"; +- else if (unlikely( +- ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)) +- error_msg = "directory entry across blocks"; ++ else if (unlikely(next_offset > size)) ++ error_msg = "directory entry overrun"; ++ else if (unlikely(next_offset > size - OCFS2_DIR_REC_LEN(1)) && ++ next_offset != size) ++ error_msg = "directory entry too close to end"; + + if (unlikely(error_msg != NULL)) + mlog(ML_ERROR, "bad entry in directory #%llu: %s - " +@@ -352,16 +357,17 @@ static inline int ocfs2_search_dirblock( + de_buf = first_de; + dlimit = de_buf + bytes; + +- while (de_buf < dlimit) { ++ while (de_buf < dlimit - OCFS2_DIR_MEMBER_LEN) { + /* this code is executed quadratically often */ + /* do minimal checking `by hand' */ + + de = (struct ocfs2_dir_entry *) de_buf; + +- if (de_buf + namelen <= dlimit && ++ if (de->name + namelen <= dlimit && + ocfs2_match(namelen, name, de)) { + /* found a match - just to be sure, do a full check */ +- if (!ocfs2_check_dir_entry(dir, de, bh, offset)) { ++ if (!ocfs2_check_dir_entry(dir, de, bh, first_de, ++ bytes, offset)) { + ret = -1; + goto bail; + } +@@ -1138,7 +1144,7 @@ static int __ocfs2_delete_entry(handle_t + pde = NULL; + de = (struct ocfs2_dir_entry *) first_de; + while (i < bytes) { +- if (!ocfs2_check_dir_entry(dir, de, bh, i)) { ++ if (!ocfs2_check_dir_entry(dir, de, bh, first_de, bytes, i)) { + status = -EIO; + mlog_errno(status); + goto bail; +@@ -1638,7 +1644,8 @@ int __ocfs2_add_entry(handle_t *handle, + /* These checks should've already been passed by the + * prepare function, but I guess we can leave them + * here anyway. */ +- if (!ocfs2_check_dir_entry(dir, de, insert_bh, offset)) { ++ if (!ocfs2_check_dir_entry(dir, de, insert_bh, data_start, ++ size, offset)) { + retval = -ENOENT; + goto bail; + } +@@ -1776,7 +1783,8 @@ static int ocfs2_dir_foreach_blk_id(stru + } + + de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos); +- if (!ocfs2_check_dir_entry(inode, de, di_bh, ctx->pos)) { ++ if (!ocfs2_check_dir_entry(inode, de, di_bh, (char *)data->id_data, ++ i_size_read(inode), ctx->pos)) { + /* On error, skip the f_pos to the end. */ + ctx->pos = i_size_read(inode); + break; +@@ -1869,7 +1877,8 @@ static int ocfs2_dir_foreach_blk_el(stru + while (ctx->pos < i_size_read(inode) + && offset < sb->s_blocksize) { + de = (struct ocfs2_dir_entry *) (bh->b_data + offset); +- if (!ocfs2_check_dir_entry(inode, de, bh, offset)) { ++ if (!ocfs2_check_dir_entry(inode, de, bh, bh->b_data, ++ sb->s_blocksize, offset)) { + /* On error, skip the f_pos to the + next block. */ + ctx->pos = (ctx->pos | (sb->s_blocksize - 1)) + 1; +@@ -3341,7 +3350,7 @@ static int ocfs2_find_dir_space_id(struc + struct super_block *sb = dir->i_sb; + struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data; + struct ocfs2_dir_entry *de, *last_de = NULL; +- char *de_buf, *limit; ++ char *first_de, *de_buf, *limit; + unsigned long offset = 0; + unsigned int rec_len, new_rec_len, free_space; + +@@ -3354,14 +3363,16 @@ static int ocfs2_find_dir_space_id(struc + else + free_space = dir->i_sb->s_blocksize - i_size_read(dir); + +- de_buf = di->id2.i_data.id_data; ++ first_de = di->id2.i_data.id_data; ++ de_buf = first_de; + limit = de_buf + i_size_read(dir); + rec_len = OCFS2_DIR_REC_LEN(namelen); + + while (de_buf < limit) { + de = (struct ocfs2_dir_entry *)de_buf; + +- if (!ocfs2_check_dir_entry(dir, de, di_bh, offset)) { ++ if (!ocfs2_check_dir_entry(dir, de, di_bh, first_de, ++ i_size_read(dir), offset)) { + ret = -ENOENT; + goto out; + } +@@ -3443,7 +3454,8 @@ static int ocfs2_find_dir_space_el(struc + /* move to next block */ + de = (struct ocfs2_dir_entry *) bh->b_data; + } +- if (!ocfs2_check_dir_entry(dir, de, bh, offset)) { ++ if (!ocfs2_check_dir_entry(dir, de, bh, bh->b_data, blocksize, ++ offset)) { + status = -ENOENT; + goto bail; + } diff --git a/queue-6.1/series b/queue-6.1/series new file mode 100644 index 00000000000..d19f52f7e73 --- /dev/null +++ b/queue-6.1/series @@ -0,0 +1,7 @@ +drm-amdgpu-fix-signedness-bug-in-sdma_v4_0_process_trap_irq.patch +f2fs-avoid-dead-loop-in-f2fs_issue_checkpoint.patch +ocfs2-add-bounds-checking-to-ocfs2_check_dir_entry.patch +jfs-don-t-walk-off-the-end-of-ealist.patch +fs-ntfs3-validate-ff-offset.patch +alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch +alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch