Skip to contentSkip to conversation

scsi: ufs: fix memory boundary check for UFS 3.0

PATCH In review Jaegeuk Kim 2 participants 3 messages Dec 11, 2020 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: fix memory boundary check for UFS 3.0

From: Jaegeuk Kim <[email protected]>

If param_offset is greater than what UFS supports, it'll give kernel panic.

Change-Id I48ea6f3f3074bd42abf4ecf8be87806732f3e6a3
---
 drivers/scsi/ufs/ufshcd.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +3 -0
index d6a3a0ba6960..04687661d0df 100644
@@ -3194,6 +3194,9 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
 		return -EINVAL;
 	}
 
+	if (param_offset > buff_len)
+		return -EINVAL;
+
 	/* Check whether we need temp memory */
 	if (param_offset != 0 || param_size < buff_len) {
 		desc_buf = kmalloc(buff_len, GFP_KERNEL);
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
#1 lore raw
Quoted 16 lines · Jaegeuk Kim

From: Jaegeuk Kim <[email protected]>

If param_offset is greater than what UFS supports, it'll give kernel panic.

Change-Id I48ea6f3f3074bd42abf4ecf8be87806732f3e6a3
---
 drivers/scsi/ufs/ufshcd.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +0 -0
index d6a3a0ba6960..04687661d0df 100644

drivers/scsi/ufs/ufshcd.c int ufshcd_read_desc_param(struct ufs_hba *hba, · line 3202

Quoted 9 lines
drivers/scsi/ufs/ufshcd.c +3 -0
@@ -3194,6 +3194,9 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
 		return -EINVAL;
 	}
 
+	if (param_offset > buff_len)
+		return -EINVAL;
+
 	/* Check whether we need temp memory */
 	if (param_offset != 0 || param_size < buff_len) {
 		desc_buf = kmalloc(buff_len, GFP_KERNEL);

Didn't this already get fixed by:

	commit 1699f980d87fb678a669490462cf0b9517c1fb47
	Author: Can Guo <[email protected]>
	Date:   Wed Oct 21 22:59:00 2020 -0700

	    scsi: ufs: Fix unexpected values from ufshcd_read_desc_param()
#2 lore raw
Quoted 29 lines · Eric Biggers
Quoted 16 lines · Jaegeuk Kim

From: Jaegeuk Kim <[email protected]>

If param_offset is greater than what UFS supports, it'll give kernel panic.

Change-Id I48ea6f3f3074bd42abf4ecf8be87806732f3e6a3
---
 drivers/scsi/ufs/ufshcd.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/scsi/ufs/ufshcd.c +0 -0
index d6a3a0ba6960..04687661d0df 100644

drivers/scsi/ufs/ufshcd.c int ufshcd_read_desc_param(struct ufs_hba *hba, · line 3202

Quoted 9 lines
drivers/scsi/ufs/ufshcd.c +3 -0
@@ -3194,6 +3194,9 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
 		return -EINVAL;
 	}
 
+	if (param_offset > buff_len)
+		return -EINVAL;
+
 	/* Check whether we need temp memory */
 	if (param_offset != 0 || param_size < buff_len) {
 		desc_buf = kmalloc(buff_len, GFP_KERNEL);

Didn't this already get fixed by:

Quoted 5 lines
	commit 1699f980d87fb678a669490462cf0b9517c1fb47
	Author: Can Guo <[email protected]>
	Date:   Wed Oct 21 22:59:00 2020 -0700

	    scsi: ufs: Fix unexpected values from ufshcd_read_desc_param()

Oh, cool. Yes, please ignore this.

Thanks,