linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] tracing: check for allocation failure
@ 2012-07-11  6:35 Dan Carpenter
  2012-07-18  9:41 ` [tip:perf/core] tracing: Check for allocation failure in __tracing_open() tip-bot for Dan Carpenter
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-07-11  6:35 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Frederic Weisbecker, Ingo Molnar, linux-kernel, kernel-janitors

Clean up and return -ENOMEM on if the kzalloc() fails.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

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);
 }

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:perf/core] tracing: Check for allocation failure in __tracing_open()
  2012-07-11  6:35 [patch] tracing: check for allocation failure Dan Carpenter
@ 2012-07-18  9:41 ` tip-bot for Dan Carpenter
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Dan Carpenter @ 2012-07-18  9:41 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: mingo, linux-kernel, hpa, mingo, fweisbec, rostedt, tglx,
	dan.carpenter

Commit-ID:  93574fcc5b50cc7b8834698acb2ce947e5b6a5dc
Gitweb:     http://git.kernel.org/tip/93574fcc5b50cc7b8834698acb2ce947e5b6a5dc
Author:     Dan Carpenter <dan.carpenter@oracle.com>
AuthorDate: Wed, 11 Jul 2012 09:35:08 +0300
Committer:  Steven Rostedt <rostedt@goodmis.org>
CommitDate: Wed, 11 Jul 2012 19:56:26 -0400

tracing: Check for allocation failure in __tracing_open()

Clean up and return -ENOMEM on if the kzalloc() fails.

This also prevents a potential crash, as the pointer that failed to
allocate would be later used.

Link: http://lkml.kernel.org/r/20120711063507.GF11812@elgon.mountain

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 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);
 }

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-18  9:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-11  6:35 [patch] tracing: check for allocation failure Dan Carpenter
2012-07-18  9:41 ` [tip:perf/core] tracing: Check for allocation failure in __tracing_open() tip-bot for Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).