Commit 17a05cca authored Jan 19, 2014 by Christian Engelmayer Committed by Jens Axboe Jan 21, 2014

block: Fix memory leak in rw_copy_check_uvector() handling



Fix a memory leak in the error handling path of function sg_io()
that is used during the processing of scsi ioctl. Memory already
allocated by rw_copy_check_uvector() needs to be freed correctly.
Detected by Coverity: CID 1128953.

Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 5837c80e

block/scsi_ioctl.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -323,12 +323,14 @@ static int sg_io(struct request_queue q, struct gendisk bd_disk,

		if (hdr->iovec_count) {
		size_t iov_data_len;
		struct iovec *iov;
		struct iovec *iov = NULL;

		ret = rw_copy_check_uvector(-1, hdr->dxferp, hdr->iovec_count,
		0, NULL, &iov);
		if (ret < 0)
		if (ret < 0) {
		kfree(iov);
		goto out;
		}

		iov_data_len = ret;
		ret = 0;