diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2017-03-31 12:32:45 -0700 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2017-03-31 15:44:25 -0400 |
| commit | 86e3e83b443669dd2bcc5c8a83b23e3aa0694c0d (patch) | |
| tree | 6ee3cca754ded2955d911bce8bd931c2d1c2f0e4 /drivers/md | |
| parent | 7a0c5c5b834fb60764b494b0e39c239da3b0774b (diff) | |
| download | op-kernel-dev-86e3e83b443669dd2bcc5c8a83b23e3aa0694c0d.zip op-kernel-dev-86e3e83b443669dd2bcc5c8a83b23e3aa0694c0d.tar.gz | |
dm verity fec: fix bufio leaks
Buffers read through dm_bufio_read() were not released in all code paths.
Fixes: a739ff3f543a ("dm verity: add support for forward error correction")
Cc: stable@vger.kernel.org # v4.5+
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-verity-fec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index c3cc04d..78f3601 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -146,8 +146,6 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, block = fec_buffer_rs_block(v, fio, n, i); res = fec_decode_rs8(v, fio, block, &par[offset], neras); if (res < 0) { - dm_bufio_release(buf); - r = res; goto error; } @@ -172,6 +170,8 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, done: r = corrected; error: + dm_bufio_release(buf); + if (r < 0 && neras) DMERR_LIMIT("%s: FEC %llu: failed to correct: %d", v->data_dev->name, (unsigned long long)rsb, r); @@ -269,7 +269,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, &is_zero) == 0) { /* skip known zero blocks entirely */ if (is_zero) - continue; + goto done; /* * skip if we have already found the theoretical |
