From 0ed7593111f765b786a715b18df536983833db2f Mon Sep 17 00:00:00 2001 From: Veera Vegivada Date: Mon, 7 Dec 2020 11:02:22 +0530 Subject: [PATCH] scsi: ufs: Fix IOCTL error checking for input buffer The check for user buffer != NULL in ufshcd_ioctl() should only be done at a point when we know we have a valid IOCTL command. Move this check inside the UFS_IOCTL_QUERY handling code. Change-Id: I10e86b30ae1fdd8c9230db476bb593ccfa94b55c Signed-off-by: Anjana Signed-off-by: Veera Vegivada --- drivers/scsi/ufs/ufs-qcom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 350d1990c22a..6706036a032b 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -2403,13 +2403,13 @@ ufs_qcom_ioctl(struct scsi_device *dev, unsigned int cmd, void __user *buffer) int err = 0; BUG_ON(!hba); - if (!buffer) { - dev_err(hba->dev, "%s: User buffer is NULL!\n", __func__); - return -EINVAL; - } switch (cmd) { case UFS_IOCTL_QUERY: + if (!buffer) { + dev_err(hba->dev, "%s: User buffer is NULL!\n", __func__); + return -EINVAL; + } pm_runtime_get_sync(hba->dev); err = ufs_qcom_query_ioctl(hba, ufshcd_scsi_to_upiu_lun(dev->lun),