moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FROMGIT: scsi: ufs: core: Fix an error handling path in ufshcd_read_desc_param()

Browse Source 
If an error occurs, some memory may need to be freed, as in the other error
handling paths.

Before the commit in the Fixes tag, this test was done before the memory
allocation, so there was no issue.

Fixes: 16ed9d312b42 ("scsi: ufs: core: Remove ufshcd_map_desc_id_to_length()")
Link: https://lore.kernel.org/r/2c6e42205e5ec22e5e8c7c85c6deb8fde31c74da.1673781835.git.christophe.jaillet@wanadoo.fr
Change-Id: Ia09dd2a289deccf75f77f68378be9b53675cf160
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 833f7d4819a88f027033e0033ea44f7ae3e45a9b git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Christophe JAILLET
2023-01-15 12:24:17 +01:00
committed by Bart Van Assche
parent 531b704375
commit 30fd2f4242
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ufs/core/ufshcd.c
View File

@@ -3593,7 +3593,8 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
if (param_offset >= buff_len) { if (param_offset >= buff_len) {
dev_err(hba->dev, "%s: Invalid offset 0x%x in descriptor IDN 0x%x, length 0x%x\n", dev_err(hba->dev, "%s: Invalid offset 0x%x in descriptor IDN 0x%x, length 0x%x\n",
__func__, param_offset, desc_id, buff_len); __func__, param_offset, desc_id, buff_len);
return -EINVAL; ret = -EINVAL;
goto out;
} }
/* Sanity check */ /* Sanity check */