UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm verity fec: fix bufio leaks 

Buffers read through dm_bufio_read() were not released in all code paths.

Fixes: a739ff3f54 ("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>
This commit is contained in:
Sami Tolvanen 2017-03-31 12:32:45 -07:00 committed by Mike Snitzer
parent 7a0c5c5b83
commit 86e3e83b44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/dm-verity-fec.c
View File

@ -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); block = fec_buffer_rs_block(v, fio, n, i);
res = fec_decode_rs8(v, fio, block, &par[offset], neras); res = fec_decode_rs8(v, fio, block, &par[offset], neras);
if (res < 0) { if (res < 0) {
dm_bufio_release(buf);
r = res; r = res;
goto error; goto error;
} }
@ -172,6 +170,8 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio,
done: done:
r = corrected; r = corrected;
error: error:
dm_bufio_release(buf);
if (r < 0 && neras) if (r < 0 && neras)
DMERR_LIMIT("%s: FEC %llu: failed to correct: %d", DMERR_LIMIT("%s: FEC %llu: failed to correct: %d",
v->data_dev->name, (unsigned long long)rsb, r); 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) { &is_zero) == 0) {
/* skip known zero blocks entirely */ /* skip known zero blocks entirely */
if (is_zero) if (is_zero)
continue; goto done;
/* /*
* skip if we have already found the theoretical * skip if we have already found the theoretical