diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:18:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:18:00 +0200 |
| commit | 6e0f17be0361444862637e8986c8c1a3b3f8dcf8 (patch) | |
| tree | 12322ecf05872d9c30c8cf3d77d4ed6961e87cd7 | |
| parent | a2fe194723f6e4990d01d8c208c7b138fd410522 (diff) | |
| parent | 93574fcc5b50cc7b8834698acb2ce947e5b6a5dc (diff) | |
| download | op-kernel-dev-6e0f17be0361444862637e8986c8c1a3b3f8dcf8.zip op-kernel-dev-6e0f17be0361444862637e8986c8c1a3b3f8dcf8.tar.gz | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing fix from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 814ff30..a120f98 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2390,6 +2390,9 @@ __tracing_open(struct inode *inode, struct file *file) iter->buffer_iter = kzalloc(sizeof(*iter->buffer_iter) * num_possible_cpus(), GFP_KERNEL); + if (!iter->buffer_iter) + goto release; + /* * We make a copy of the current tracer to avoid concurrent * changes on it while we are reading. @@ -2451,6 +2454,7 @@ __tracing_open(struct inode *inode, struct file *file) mutex_unlock(&trace_types_lock); kfree(iter->trace); kfree(iter->buffer_iter); +release: seq_release_private(inode, file); return ERR_PTR(-ENOMEM); } |
