mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
block/bio-integrity: fix a memory leak bug
[ Upstream commit e7bf90e5af
]
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>
This commit is contained in:
parent
7f775a67ab
commit
af50d6a1c2
1 changed files with 6 additions and 2 deletions
|
@ -291,8 +291,12 @@ bool bio_integrity_prep(struct bio *bio)
|
||||||
ret = bio_integrity_add_page(bio, virt_to_page(buf),
|
ret = bio_integrity_add_page(bio, virt_to_page(buf),
|
||||||
bytes, offset);
|
bytes, offset);
|
||||||
|
|
||||||
if (ret == 0)
|
if (ret == 0) {
|
||||||
return false;
|
printk(KERN_ERR "could not attach integrity payload\n");
|
||||||
|
kfree(buf);
|
||||||
|
status = BLK_STS_RESOURCE;
|
||||||
|
goto err_end_io;
|
||||||
|
}
|
||||||
|
|
||||||
if (ret < bytes)
|
if (ret < bytes)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue