diff options
| author | Tony Battersby <tonyb@cybernetics.com> | 2014-10-23 21:10:21 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-10-28 17:27:10 +0100 |
| commit | c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3 (patch) | |
| tree | 01a12fe33e69209f0ba279d749558c47af17f952 /lib/scatterlist.c | |
| parent | block: fix wrong error return in elevator_init() (diff) | |
| download | linux-c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3.tar.xz linux-c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3.zip | |
lib/scatterlist: fix memory leak with scsi-mq
Fix a memory leak with scsi-mq triggered by commands with large data
transfer length.
Fixes: c53c6d6a68b1 ("scatterlist: allow chaining to preallocated chunks")
Cc: <stable@vger.kernel.org> # 3.17.x
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'lib/scatterlist.c')
| -rw-r--r-- | lib/scatterlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 9cdf62f8accd..c9f2e8c6ccc9 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -203,10 +203,10 @@ void __sg_free_table(struct sg_table *table, unsigned int max_ents, } table->orig_nents -= sg_size; - if (!skip_first_chunk) { - free_fn(sgl, alloc_size); + if (skip_first_chunk) skip_first_chunk = false; - } + else + free_fn(sgl, alloc_size); sgl = next; } |