Skip to contentSkip to conversation

squashfs: enhance parallel I/O

DISCUSSION Dan Carpenter 2 participants 3 messages Nov 6, 2013 – Nov 8, 2013 Kernel janitors

lore
Share & tools
lore
#0 lore raw

Hello Minchan Kim,

This is a semi-automatic email about new static checker warnings.

The patch 8ae6a7f5a3a8: "squashfs: enhance parallel I/O" from Oct 28, 2013, leads to the following Smatch complaint:

fs/squashfs/decompressor_multi.c:124 squashfs_decompressor_destroy()
error: we previously assumed 'stream' could be null (see line 111)

fs/squashfs/decompressor_multi.c
110 struct squashfs_stream *stream = msblk->stream;

   111		if (stream) {
                    ^^^^^^

Patch introduces a check.

112 struct decomp_stream *decomp_strm;
113
114 while (!list_empty(&stream->strm_list)) {
115 decomp_strm = list_entry(stream->strm_list.prev,
116 struct decomp_stream, list);
117 list_del(&decomp_strm->list);
118 msblk->decompressor->free(decomp_strm->stream);
119 kfree(decomp_strm);
120 stream->avail_decomp--;
121 }
122 }
123
124 WARN_ON(stream->avail_decomp);

   125		kfree(stream->comp_opts);
                      ^^^^^^^^^^^^^^^^^

Patch introduces a couple unchecked dereferences.

   126		kfree(stream);

regards,
dan carpenter

#1 lore raw
Quoted 51 lines · Minchan Kim
Quoted 38 lines · Phillip Lougher
Quoted 26 lines · Dan Carpenter

Hello Minchan Kim,

This is a semi-automatic email about new static checker warnings.

The patch 8ae6a7f5a3a8: "squashfs: enhance parallel I/O" from Oct 28, 2013, leads to the following Smatch complaint:

fs/squashfs/decompressor_multi.c:124 squashfs_decompressor_destroy()
error: we previously assumed 'stream' could be null (see line
111)

fs/squashfs/decompressor_multi.c

    110          struct squashfs_stream *stream = msblk->stream;
    111          if (stream) {
                     ^^^^^^

Patch introduces a check.

    112                  struct decomp_stream *decomp_strm;
    113
    114                  while (!list_empty(&stream->strm_list)) {
    115                          decomp_strm >>> list_entry(stream->strm_list.prev,
    116                                                  struct
decomp_stream, list);
    117                          list_del(&decomp_strm->list);
    118
  msblk->decompressor->free(decomp_strm->stream);
Quoted 9 lines
    119                          kfree(decomp_strm);
    120                          stream->avail_decomp--;
    121                  }
    122          }
    123
    124          WARN_ON(stream->avail_decomp);
    125          kfree(stream->comp_opts);
                       ^^^^^^^^^^^^^^^^^
Quoted 8 lines

Hi Minchan,

These two lines should be moved into the scope of the if (stream) { } ...

Do you want to send a V3 patch? Or I can add a fix-up patch to this V2 patch,
whatever you prefer.

Quoted 6 lines

My bad, :(
Confirmed.

Phillip, Please add a fix-up patch to v2 patch.
Thanks, Dan and Phillip.

np :-) I'll send the fix-up patch tomorrow.

Dan, I'll credit you with a Reported-by, unless you object.

Phillip

Quoted 1 line
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Phillip Lougher

np :-) I'll send the fix-up patch tomorrow.

Dan, I'll credit you with a Reported-by, unless you object.

Awesome, thanks. :)

regards,
dan carpenter