| From c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3 Mon Sep 17 00:00:00 2001 |
| From: Tony Battersby <tonyb@cybernetics.com> |
| Date: Thu, 23 Oct 2014 15:10:21 -0400 |
| Subject: lib/scatterlist: fix memory leak with scsi-mq |
| |
| From: Tony Battersby <tonyb@cybernetics.com> |
| |
| commit c21e59d8dc04b2107bdb4ff0f412a9b7ae3349f3 upstream. |
| |
| Fix a memory leak with scsi-mq triggered by commands with large data |
| transfer length. |
| |
| Fixes: c53c6d6a68b1 ("scatterlist: allow chaining to preallocated chunks") |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| lib/scatterlist.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/lib/scatterlist.c |
| +++ b/lib/scatterlist.c |
| @@ -203,10 +203,10 @@ void __sg_free_table(struct sg_table *ta |
| } |
| |
| 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; |
| } |
| |
