diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch new file mode 100644 index 0000000000..03264bac68 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-sunrpc-null-rpc_clnt-dereference-in-rpc_task_que.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 032a74d83b263c4faead8e4c25d497fb8ea07b6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
3 | Date: Thu, 12 Dec 2019 10:29:02 -0500 | ||
4 | Subject: [PATCH 2/4] Fix: sunrpc: null rpc_clnt dereference in rpc_task_queued | ||
5 | tracepoint | ||
6 | |||
7 | Based on upstream Linux commit: | ||
8 | |||
9 | commit 0be283f676a1e7b208db0c992283197ef8b52158 | ||
10 | Author: Benjamin Coddington <bcodding@redhat.com> | ||
11 | Date: Tue Jan 23 09:32:35 2018 -0500 | ||
12 | |||
13 | SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint | ||
14 | |||
15 | Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for | ||
16 | cl_clid in that case. | ||
17 | |||
18 | Signed-off-by: Benjamin Coddington <bcodding@redhat.com> | ||
19 | Signed-off-by: Trond Myklebust <trondmy@gmail.com> | ||
20 | |||
21 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
22 | Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/8f83a9103dcdf4f6b73783427fc5ded4869309d5] | ||
23 | Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> | ||
24 | --- | ||
25 | instrumentation/events/lttng-module/rpc.h | 3 ++- | ||
26 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h | ||
29 | index fb13106..68c622c 100644 | ||
30 | --- a/instrumentation/events/lttng-module/rpc.h | ||
31 | +++ b/instrumentation/events/lttng-module/rpc.h | ||
32 | @@ -176,7 +176,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, | ||
33 | |||
34 | TP_FIELDS( | ||
35 | ctf_integer(unsigned int, task_id, task->tk_pid) | ||
36 | - ctf_integer(unsigned int, client_id, task->tk_client->cl_clid) | ||
37 | + ctf_integer(unsigned int, client_id, task->tk_client ? | ||
38 | + task->tk_client->cl_clid : -1) | ||
39 | ctf_integer(unsigned long, timeout, task->tk_timeout) | ||
40 | ctf_integer(unsigned long, runstate, task->tk_runstate) | ||
41 | ctf_integer(int, status, task->tk_status) | ||
42 | -- | ||
43 | 2.17.1 | ||
44 | |||