From 8f66899cbff5e019b9265e74dd220ff6eb29fbfa Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 23 Nov 2021 12:32:02 -0600 Subject: kernel-5.15-201 * Tue Nov 23 2021 Justin M. Forbes [5.15-201] - Revert "fuse: fix page stealing" (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 9 ++++++--- patch-5.15-redhat.patch | 35 ++++++++++++++++++++++++++++++++++- sources | 4 ++-- 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 883210af7..bfa45eb25 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/0deebf76b98dd42393d8f9fa97e196c77d608c7d + 0deebf76b98dd42393d8f9fa97e196c77d608c7d Revert "fuse: fix page stealing" + https://gitlab.com/cki-project/kernel-ark/-/commit/ba79f081c3d211f6dda25d73f03c599aab6f8972 ba79f081c3d211f6dda25d73f03c599aab6f8972 mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv diff --git a/kernel.spec b/kernel.spec index 38150f704..fe4db9377 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 200 +%global distro_build 201 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.15.4 %define patchversion 5.15 -%define pkgrelease 200 +%define pkgrelease 201 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 200%{?buildid}%{?dist} +%define specrelease 201%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -2972,6 +2972,9 @@ fi # # %changelog +* Tue Nov 23 2021 Justin M. Forbes [5.15-201] +- Revert "fuse: fix page stealing" (Justin M. Forbes) + * Mon Nov 22 2021 Justin M. Forbes [5.15-0] - mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv (Zekun Shen) - atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait (Zekun Shen) diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 54cd3fd82..50989dc71 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -36,6 +36,7 @@ drivers/usb/core/hub.c | 7 ++ drivers/usb/host/xhci-tegra.c | 41 +++++-- fs/btrfs/async-thread.c | 14 +++ + fs/fuse/dev.c | 14 +-- include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -49,7 +50,7 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 51 files changed, 803 insertions(+), 215 deletions(-) + 52 files changed, 805 insertions(+), 227 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 1396fd2d9031..4bc97128cee8 100644 @@ -1809,6 +1810,38 @@ index 309516e6a968..d39af03b456c 100644 set_bit(WORK_DONE_BIT, &work->flags); run_ordered_work(wq, work); } else { +diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c +index 5a1f142bdb48..dde341a6388a 100644 +--- a/fs/fuse/dev.c ++++ b/fs/fuse/dev.c +@@ -847,12 +847,6 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) + + replace_page_cache_page(oldpage, newpage); + +- /* +- * Release while we have extra ref on stolen page. Otherwise +- * anon_pipe_buf_release() might think the page can be reused. +- */ +- pipe_buf_release(cs->pipe, buf); +- + get_page(newpage); + + if (!(buf->flags & PIPE_BUF_FLAG_LRU)) +@@ -2037,12 +2031,8 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, + + pipe_lock(pipe); + out_free: +- for (idx = 0; idx < nbuf; idx++) { +- struct pipe_buffer *buf = &bufs[idx]; +- +- if (buf->ops) +- pipe_buf_release(pipe, buf); +- } ++ for (idx = 0; idx < nbuf; idx++) ++ pipe_buf_release(pipe, &bufs[idx]); + pipe_unlock(pipe); + + kvfree(bufs); diff --git a/include/linux/efi.h b/include/linux/efi.h index 6b5d36babfcc..fd4a5d66a9d0 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index 850cf47ed..bbfb1f5ca 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.15.4.tar.xz) = d8fdb23dd14f4ec5138dee0da8a3e2e22ab676b27618bbee505f8c46d1e01331865146928c6bf3f8ed74479ecb3c77609d25be8b21f3db9131da48b55a613aa8 -SHA512 (kernel-abi-stablelists-5.15.4-200.tar.bz2) = d1d2de637c34972c4aaab9859283a370835cf7f0a36ca1dceac5ebb81fe498bb0ef5c73dd017db69f9efda0cdfd97281431e07f3f242cea7fdee683dd1e97bef -SHA512 (kernel-kabi-dw-5.15.4-200.tar.bz2) = d09b0e57f768186e6efbd236cd817687bf05283524d5747cfa83c055b1134e124e9cf8101fbce5bcb1f8f9e22ad780eee671159360bf5adbb66dad1c69d8a0ee +SHA512 (kernel-abi-stablelists-5.15.4-201.tar.bz2) = c798e618b03d9aee4257d69439114dce333153310970f424bd6b79f3dd835a2f51db149e430c6158f686e5ec745227591e05da6732e341f3e12f2a6d8ceb9dea +SHA512 (kernel-kabi-dw-5.15.4-201.tar.bz2) = ccd77a910e47a0dc345abd20f91b7351f6dfd4cf2fc822f270af4b4477f5507c767adfa442f137db04ceaf3d0ff856d22aaaa7c9507c9374ec877af75e8cf0e3 -- cgit