Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 179fd82c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: fix a possible kernel info leak to userspace"

parents 39179b5a 1533b9db

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -4899,7 +4899,7 @@ static int ufshcd_query_ioctl(struct ufs_hba *hba, u8 lun, void __user *buffer) 
	u8 index;

	u8 *desc = NULL;



	ioctl_data = kmalloc(sizeof(struct ufs_ioctl_query_data), GFP_KERNEL);

	ioctl_data = kzalloc(sizeof(struct ufs_ioctl_query_data), GFP_KERNEL);

	if (!ioctl_data) {

		dev_err(hba->dev, "%s: Failed allocating %zu bytes\n", __func__,

				sizeof(struct ufs_ioctl_query_data));
@@ -4943,7 +4943,7 @@ static int ufshcd_query_ioctl(struct ufs_hba *hba, u8 lun, void __user *buffer) 
		}

		length = min_t(int, QUERY_DESC_MAX_SIZE,

				ioctl_data->buf_size);

		desc = kmalloc(length, GFP_KERNEL);

		desc = kzalloc(length, GFP_KERNEL);

		if (!desc) {

			dev_err(hba->dev, "%s: Failed allocating %d bytes\n",

					__func__, length);