Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch b/queue-4.14/nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch
new file mode 100644 (file)
index 0000000..47ea584
--- /dev/null
+++ b/queue-4.14/nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch
@@ -0,0 +1,38 @@
+From 79ec3bf417fcbd5887123e9165e445e57f67bf4b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 3 Jun 2021 15:37:53 +0300
+Subject: NFS: Fix a potential NULL dereference in nfs_get_client()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+[ Upstream commit 09226e8303beeec10f2ff844d2e46d1371dc58e0 ]
+
+None of the callers are expecting NULL returns from nfs_get_client() so
+this code will lead to an Oops.  It's better to return an error
+pointer.  I expect that this is dead code so hopefully no one is
+affected.
+
+Fixes: 31434f496abb ("nfs: check hostname in nfs_get_client")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/nfs/client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/nfs/client.c b/fs/nfs/client.c
+index 9e7d49fac4e3..1f74893b2b0c 100644
+--- a/fs/nfs/client.c
++++ b/fs/nfs/client.c
+@@ -406,7 +406,7 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init)
+ 
+       if (cl_init->hostname == NULL) {
+               WARN_ON(1);
+-              return NULL;
++              return ERR_PTR(-EINVAL);
+       }
+ 
+       /* see if the client already exists */
+-- 
+2.30.2
+

diff --git a/queue-4.14/perf-session-correct-buffer-copying-when-peeking-eve.patch b/queue-4.14/perf-session-correct-buffer-copying-when-peeking-eve.patch
new file mode 100644 (file)
index 0000000..a62508e
--- /dev/null
+++ b/queue-4.14/perf-session-correct-buffer-copying-when-peeking-eve.patch
@@ -0,0 +1,55 @@
+From 30bd40aa11929063af5cc85f12b178567dc11374 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 5 Jun 2021 13:29:57 +0800
+Subject: perf session: Correct buffer copying when peeking events
+
+From: Leo Yan <leo.yan@linaro.org>
+
+[ Upstream commit 197eecb6ecae0b04bd694432f640ff75597fed9c ]
+
+When peeking an event, it has a short path and a long path.  The short
+path uses the session pointer "one_mmap_addr" to directly fetch the
+event; and the long path needs to read out the event header and the
+following event data from file and fill into the buffer pointer passed
+through the argument "buf".
+
+The issue is in the long path that it copies the event header and event
+data into the same destination address which pointer "buf", this means
+the event header is overwritten.  We are just lucky to run into the
+short path in most cases, so we don't hit the issue in the long path.
+
+This patch adds the offset "hdr_sz" to the pointer "buf" when copying
+the event data, so that it can reserve the event header which can be
+used properly by its caller.
+
+Fixes: 5a52f33adf02 ("perf session: Add perf_session__peek_event()")
+Signed-off-by: Leo Yan <leo.yan@linaro.org>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Acked-by: Jiri Olsa <jolsa@redhat.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Kan Liang <kan.liang@linux.intel.com>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lore.kernel.org/lkml/20210605052957.1070720-1-leo.yan@linaro.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ tools/perf/util/session.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
+index decd5d147e81..735dc862c7f8 100644
+--- a/tools/perf/util/session.c
++++ b/tools/perf/util/session.c
+@@ -1475,6 +1475,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset,
+       if (event->header.size < hdr_sz || event->header.size > buf_sz)
+               return -1;
+ 
++      buf += hdr_sz;
+       rest = event->header.size - hdr_sz;
+ 
+       if (readn(fd, buf, rest) != (ssize_t)rest)
+-- 
+2.30.2
+

diff --git a/queue-4.14/series b/queue-4.14/series
index a54da38232defab8497174c6e10508ea74dc4472..fb5c60c23bcd35184270ed150233142bb85003b4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -37,3 +37,5 @@ usb-fix-various-gadget-panics-on-10gbps-cabling.patch
 regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch
 regulator-max77620-use-device_set_of_node_from_dev.patch
 perf-fix-data-race-between-pin_count-increment-decrement.patch
+nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch
+perf-session-correct-buffer-copying-when-peeking-eve.patch