From: Sasha Levin Date: Sun, 13 Jun 2021 23:34:55 +0000 (-0400) Subject: Fixes for 4.14 X-Git-Tag: v4.4.273~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b2a9ccc478150713a0a157fedf3884a140c0f39;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- 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 index 00000000000..47ea584823f --- /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 +Date: Thu, 3 Jun 2021 15:37:53 +0300 +Subject: NFS: Fix a potential NULL dereference in nfs_get_client() + +From: Dan Carpenter + +[ 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 +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + 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 index 00000000000..a62508e0d34 --- /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 +Date: Sat, 5 Jun 2021 13:29:57 +0800 +Subject: perf session: Correct buffer copying when peeking events + +From: Leo Yan + +[ 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 +Acked-by: Adrian Hunter +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Kan Liang +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lore.kernel.org/lkml/20210605052957.1070720-1-leo.yan@linaro.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + 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 a54da38232d..fb5c60c23bc 100644 --- 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