From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 May 2019 14:07:18 +0000 (+0200)
Subject: fix backport of fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
X-Git-Tag: v4.9.173~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8cf05fda68ba85f0b7e96b5854ec0d7b9a5d45b;p=thirdparty%2Fkernel%2Fstable-queue.git

fix backport of fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
---

diff --git a/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index 357c26bd7b0..b95f20c8ebd 100644
--- a/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6744,7 +6744,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6739,12 +6739,16 @@ static void buffer_pipe_buf_release(stru
+ 	buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+ 				struct pipe_buffer *buf)
  {
  	struct buffer_ref *ref = (struct buffer_ref *)buf->private;
  
diff --git a/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index 98fcf7fb04d..742bd38d29e 100644
--- a/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6828,7 +6828,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6823,12 +6823,16 @@ static void buffer_pipe_buf_release(stru
+ 	buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+ 				struct pipe_buffer *buf)
  {
  	struct buffer_ref *ref = (struct buffer_ref *)buf->private;
  
diff --git a/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index b8869b70c86..3a9e328a7db 100644
--- a/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6848,7 +6848,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6843,12 +6843,16 @@ static void buffer_pipe_buf_release(stru
+ 	buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+ 				struct pipe_buffer *buf)
  {
  	struct buffer_ref *ref = (struct buffer_ref *)buf->private;