Browse Source

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>
Christian Engelmayer 11 years ago
parent
commit
17a05cca99
1 changed files with 4 additions and 2 deletions
  1. 4 2
      block/scsi_ioctl.c

+ 4 - 2
block/scsi_ioctl.c

@@ -323,12 +323,14 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
 
 
 	if (hdr->iovec_count) {
 	if (hdr->iovec_count) {
 		size_t iov_data_len;
 		size_t iov_data_len;
-		struct iovec *iov;
+		struct iovec *iov = NULL;
 
 
 		ret = rw_copy_check_uvector(-1, hdr->dxferp, hdr->iovec_count,
 		ret = rw_copy_check_uvector(-1, hdr->dxferp, hdr->iovec_count,
 					    0, NULL, &iov);
 					    0, NULL, &iov);
-		if (ret < 0)
+		if (ret < 0) {
+			kfree(iov);
 			goto out;
 			goto out;
+		}
 
 
 		iov_data_len = ret;
 		iov_data_len = ret;
 		ret = 0;
 		ret = 0;