summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>2011-11-30 22:34:14 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-01 21:37:47 +0400
commit2f8e0b31ad257bca9ff5dda9fdfdcc98d38d97f8 (patch)
tree2f32febd39efc22ecf864c3f8539dadbb2bcaad0
parent976d534118219b04277fb6cfcdb71607b730746d (diff)
downloadlinux-2f8e0b31ad257bca9ff5dda9fdfdcc98d38d97f8.tar.xz
lttng lib: ring buffer: remove stale null-pointer
* Dan Carpenter <dan.carpenter@oracle.com> wrote: [...] > The patch c844b2f5cfea: "lttng lib: ring buffer" from Nov 28, 2011, > leads to the following Smatch complaint: > > drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c +1150 > +lib_ring_buffer_print_buffer_errors() > warn: variable dereferenced before check 'chan' (see line 1143) > > drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c > 1142 { > 1143 const struct lib_ring_buffer_config *config = > +chan->backend.config; > > +^^^^^^^^^^^^^^^^^^^^ > Dereference. > > 1144 unsigned long write_offset, cons_offset; > 1145 > 1146 /* > 1147 * Can be called in the error path of allocation when > 1148 * trans_channel_data is not yet set. > 1149 */ > 1150 if (!chan) > ^^^^^^^^^ > Check. At first glance the comment seems out of date, I think check can > be removed safely. > > 1151 return; > 1152 /* Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c b/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c
index 802f5cd4cd16..957d7f3d7ac6 100644
--- a/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c
+++ b/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c
@@ -1144,12 +1144,6 @@ void lib_ring_buffer_print_buffer_errors(struct lib_ring_buffer *buf,
unsigned long write_offset, cons_offset;
/*
- * Can be called in the error path of allocation when
- * trans_channel_data is not yet set.
- */
- if (!chan)
- return;
- /*
* No need to order commit_count, write_offset and cons_offset reads
* because we execute at teardown when no more writer nor reader
* references are left.