Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1389356

[for-next][PATCH 2/5] tracing: checking for NULL instead of IS_ERR()

Show all headers | View raw

From: Dan Carpenter <dan.carpenter@oracle.com>

tracing_map_elt_alloc() returns ERR_PTRs on error, never NULL.

Fixes: 08d43a5fa063 ('tracing: Add lock-free tracing_map')
Link: http://lkml.kernel.org/r/20160423102347.GA11136@mwanda

Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/tracing_map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index e0f172932eca..e7dfc5eec669 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -814,7 +814,7 @@ static struct tracing_map_elt *copy_elt(struct tracing_map_elt *elt)
 	unsigned int i;
 
 	dup_elt = tracing_map_elt_alloc(elt->map);
-	if (!dup_elt)
+	if (IS_ERR(dup_elt))
 		return NULL;
 
 	if (elt->map->ops && elt->map->ops->elt_copy)
-- 
2.8.0.rc3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[for-next][PATCH 0/5] tracing: More updates for 4.7 Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200
  [for-next][PATCH 3/5] tracing: Add check for NULL event field when creating hist field Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200
  [for-next][PATCH 5/5] tracing: Dont use the address of the buffer array name in  copy_from_user Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200
  [for-next][PATCH 2/5] tracing: checking for NULL instead of IS_ERR() Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200
  [for-next][PATCH 4/5] tracing: Handle tracing_map_alloc_elts() error path correctly Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200
  [for-next][PATCH 1/5] tracing: Do not inherit event-fork option for instances Steven Rostedt <rostedt@goodmis.org> - 2016-04-27 18:40 +0200

csiph-web