Unverified Commit 3fd44f97 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7394 v2 scsi: sr: Do not leak information in ioctl 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ESO6CLAAVWXPAP47AKIQUR2PH2BH7NPP/ 
 
https://gitee.com/openeuler/kernel/issues/I9PGWG 
 
Link:https://gitee.com/openeuler/kernel/pulls/7394

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c4795f4d 0f3528a7

drivers/scsi/sr_ioctl.c

+12 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int sr_read_tochdr(struct cdrom_device_info *cdi, 
	int result;

	unsigned char *buffer;



	buffer = kmalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	buffer = kzalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	if (!buffer)

		return -ENOMEM;
@@ -59,10 +59,13 @@ static int sr_read_tochdr(struct cdrom_device_info *cdi, 
	cgc.data_direction = DMA_FROM_DEVICE;



	result = sr_do_ioctl(cd, &cgc);

	if (result)

		goto err;



	tochdr->cdth_trk0 = buffer[2];

	tochdr->cdth_trk1 = buffer[3];



err:

	kfree(buffer);

	return result;

}
@@ -75,7 +78,7 @@ static int sr_read_tocentry(struct cdrom_device_info *cdi, 
	int result;

	unsigned char *buffer;



	buffer = kmalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	buffer = kzalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	if (!buffer)

		return -ENOMEM;
@@ -90,6 +93,8 @@ static int sr_read_tocentry(struct cdrom_device_info *cdi, 
	cgc.data_direction = DMA_FROM_DEVICE;



	result = sr_do_ioctl(cd, &cgc);

	if (result)

		goto err;



	tocentry->cdte_ctrl = buffer[5] & 0xf;

	tocentry->cdte_adr = buffer[5] >> 4;
@@ -102,6 +107,7 @@ static int sr_read_tocentry(struct cdrom_device_info *cdi, 
		tocentry->cdte_addr.lba = (((((buffer[8] << 8) + buffer[9]) << 8)

			+ buffer[10]) << 8) + buffer[11];



err:

	kfree(buffer);

	return result;

}
@@ -388,7 +394,7 @@ int sr_get_mcn(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn) 
{

	Scsi_CD *cd = cdi->handle;

	struct packet_command cgc;

	char *buffer = kmalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	char *buffer = kzalloc(32, GFP_KERNEL | SR_GFP_DMA(cd));

	int result;



	if (!buffer)
@@ -404,10 +410,13 @@ int sr_get_mcn(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn) 
	cgc.data_direction = DMA_FROM_DEVICE;

	cgc.timeout = IOCTL_TIMEOUT;

	result = sr_do_ioctl(cd, &cgc);

	if (result)

		goto err;



	memcpy(mcn->medium_catalog_number, buffer + 9, 13);

	mcn->medium_catalog_number[13] = 0;



err:

	kfree(buffer);

	return result;

}