From: Greg Kroah-Hartman Date: Sat, 3 Aug 2024 06:45:02 +0000 (+0200) Subject: fuzz for 6.6 fixed up. X-Git-Tag: v6.1.103~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83ca20f149e317142c22adfc48b68c8c449fd1cf;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz for 6.6 fixed up. --- diff --git a/queue-6.6/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch b/queue-6.6/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch index dad4e196f88..0df6b8db596 100644 --- a/queue-6.6/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch +++ b/queue-6.6/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch @@ -37,14 +37,12 @@ Reviewed-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20240714065533.1112616-1-houtao@huaweicloud.com Signed-off-by: Sasha Levin --- - kernel/events/core.c | 28 +++++++++++++--------------- - 1 file changed, 13 insertions(+), 15 deletions(-) + kernel/events/core.c | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) -diff --git a/kernel/events/core.c b/kernel/events/core.c -index 32723d53b970b..1b728f3f4b539 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -9273,21 +9273,19 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog, +@@ -9299,21 +9299,19 @@ static void perf_event_bpf_emit_ksymbols bool unregister = type == PERF_BPF_EVENT_PROG_UNLOAD; int i; @@ -56,18 +54,17 @@ index 32723d53b970b..1b728f3f4b539 100644 - } else { - for (i = 0; i < prog->aux->func_cnt; i++) { - struct bpf_prog *subprog = prog->aux->func[i]; -- ++ perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF, ++ (u64)(unsigned long)prog->bpf_func, ++ prog->jited_len, unregister, ++ prog->aux->ksym.name); + - perf_event_ksymbol( - PERF_RECORD_KSYMBOL_TYPE_BPF, - (u64)(unsigned long)subprog->bpf_func, - subprog->jited_len, unregister, - subprog->aux->ksym.name); - } -+ perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF, -+ (u64)(unsigned long)prog->bpf_func, -+ prog->jited_len, unregister, -+ prog->aux->ksym.name); -+ + for (i = 1; i < prog->aux->func_cnt; i++) { + struct bpf_prog *subprog = prog->aux->func[i]; + @@ -79,6 +76,3 @@ index 32723d53b970b..1b728f3f4b539 100644 } } --- -2.43.0 - diff --git a/queue-6.6/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch b/queue-6.6/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch index f25f91f5183..9a6e3b20033 100644 --- a/queue-6.6/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch +++ b/queue-6.6/f2fs-fix-to-truncate-preallocated-blocks-in-f2fs_fil.patch @@ -55,13 +55,11 @@ Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- - fs/f2fs/f2fs.h | 1 + - fs/f2fs/file.c | 42 +++++++++++++++++++++++++++++++++++++++++- - fs/f2fs/inode.c | 8 -------- + fs/f2fs/f2fs.h | 1 + + fs/f2fs/file.c | 42 +++++++++++++++++++++++++++++++++++++++++- + fs/f2fs/inode.c | 8 -------- 3 files changed, 42 insertions(+), 9 deletions(-) -diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h -index c7e717ab09000..3219662186e49 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -798,6 +798,7 @@ enum { @@ -72,11 +70,9 @@ index c7e717ab09000..3219662186e49 100644 FI_MAX, /* max flag, never be used */ }; -diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c -index 154c55c1a0f47..96bcde73882bf 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c -@@ -534,6 +534,42 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) +@@ -534,6 +534,42 @@ static int f2fs_file_mmap(struct file *f return 0; } @@ -119,7 +115,7 @@ index 154c55c1a0f47..96bcde73882bf 100644 static int f2fs_file_open(struct inode *inode, struct file *filp) { int err = fscrypt_file_open(inode, filp); -@@ -551,7 +587,11 @@ static int f2fs_file_open(struct inode *inode, struct file *filp) +@@ -551,7 +587,11 @@ static int f2fs_file_open(struct inode * filp->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC; filp->f_mode |= FMODE_CAN_ODIRECT; @@ -132,11 +128,9 @@ index 154c55c1a0f47..96bcde73882bf 100644 } void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) -diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c -index ab2eecd986ec5..928e8f6743f8f 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c -@@ -610,14 +610,6 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) +@@ -613,14 +613,6 @@ make_now: } f2fs_set_inode_flags(inode); @@ -151,6 +145,3 @@ index ab2eecd986ec5..928e8f6743f8f 100644 unlock_new_inode(inode); trace_f2fs_iget(inode); return inode; --- -2.43.0 -