Commit af50d6a1 authored Jul 11, 2019 by Wenwen Wang Committed by Greg Kroah-Hartman Jul 31, 2019

block/bio-integrity: fix a memory leak bug



[ Upstream commit e7bf90e5afe3aa1d1282c1635a49e17a32c4ecec ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7f775a67

block/bio-integrity.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -291,8 +291,12 @@ bool bio_integrity_prep(struct bio *bio)
		ret = bio_integrity_add_page(bio, virt_to_page(buf),
		bytes, offset);

		if (ret == 0)
		return false;
		if (ret == 0) {
		printk(KERN_ERR "could not attach integrity payload\n");
		kfree(buf);
		status = BLK_STS_RESOURCE;
		goto err_end_io;
		}

		if (ret < bytes)
		break;