Skip to content

Commit

Permalink
lttng lib: ring buffer move null pointer check to open
Browse files Browse the repository at this point in the history
* Dan Carpenter <dan.carpenter@oracle.com> wrote:
> The patch c844b2f: "lttng lib: ring buffer" from Nov 28, 2011,
> leads to the following Smatch complaint:
>
> drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c +86
> +lib_ring_buffer_mmap_buf()
>          warn: variable dereferenced before check 'buf' (see line 79)
>
> drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c
>     78          unsigned long length = vma->vm_end - vma->vm_start;
>     79          struct channel *chan = buf->backend.chan;
>                                        ^^^^^^^^^^^^^^^^^
> Dereference.
>
>     80          const struct lib_ring_buffer_config *config = chan->backend.config;
>     81          unsigned long mmap_buf_len;
>     82
>     83          if (config->output != RING_BUFFER_MMAP)
>     84                  return -EINVAL;
>     85
>     86          if (!buf)
>                     ^^^^
> Check.
>
>     87                  return -EBADF;
>     88

Let's move the NULL buf check to the file "open", where it belongs. The
"open" file operation is the actual interface between lib ring buffer
and the modules using it.

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>
  • Loading branch information
Mathieu Desnoyers authored and Greg Kroah-Hartman committed Dec 1, 2011
1 parent e5f7787 commit eeb34e2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ static int lib_ring_buffer_mmap_buf(struct lib_ring_buffer *buf,
if (config->output != RING_BUFFER_MMAP)
return -EINVAL;

if (!buf)
return -EBADF;

mmap_buf_len = chan->backend.buf_size;
if (chan->backend.extra_reader_sb)
mmap_buf_len += chan->backend.subbuf_size;
Expand Down
3 changes: 3 additions & 0 deletions drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ int lib_ring_buffer_open(struct inode *inode, struct file *file)
struct lib_ring_buffer *buf = inode->i_private;
int ret;

if (!buf)
return -EINVAL;

ret = lib_ring_buffer_open_read(buf);
if (ret)
return ret;
Expand Down

0 comments on commit eeb34e2

Please sign in to comment.