Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block/bio-integrity: fix a memory leak bug

In bio_integrity_prep(), a kernel buffer is allocated through kmalloc() to
hold integrity metadata. Later on, the buffer will be attached to the bio
structure through bio_integrity_add_page(), which returns the number of
bytes of integrity metadata attached. Due to unexpected situations,
bio_integrity_add_page() may return 0. As a result, bio_integrity_prep()
needs to be terminated with 'false' returned to indicate this error.
However, the allocated kernel buffer is not freed on this execution path,
leading to a memory leak.

To fix this issue, free the allocated buffer before returning from
bio_integrity_prep().

Reviewed-by: Ming Lei <ming.lei@redhat.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Wenwen Wang and committed by
Jens Axboe
e7bf90e5 7d30c81b

+6 -2
+6 -2
block/bio-integrity.c
··· 276 276 ret = bio_integrity_add_page(bio, virt_to_page(buf), 277 277 bytes, offset); 278 278 279 - if (ret == 0) 280 - return false; 279 + if (ret == 0) { 280 + printk(KERN_ERR "could not attach integrity payload\n"); 281 + kfree(buf); 282 + status = BLK_STS_RESOURCE; 283 + goto err_end_io; 284 + } 281 285 282 286 if (ret < bytes) 283 287 break;