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

Commit 675d9196 authored by Yaniv Gardi's avatar Yaniv Gardi Committed by Greg Kroah-Hartman
Browse files

scsi: ufs: fix bugs related to null pointer access and array size 



commit e3ce73d69aff44421d7899b235fec5ac2c306ff4 upstream.

In this change there are a few fixes of possible NULL pointer access and
possible access to index that exceeds array boundaries.

Signed-off-by: default avatarYaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bea268e

drivers/scsi/ufs/ufs.h

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define QUERY_DESC_HDR_SIZE       2

#define QUERY_OSF_SIZE            (GENERAL_UPIU_REQUEST_SIZE - \

					(sizeof(struct utp_upiu_header)))

#define RESPONSE_UPIU_SENSE_DATA_LENGTH	18



#define UPIU_HEADER_DWORD(byte3, byte2, byte1, byte0)\

			cpu_to_be32((byte3 << 24) | (byte2 << 16) |\
@@ -410,7 +411,7 @@ struct utp_cmd_rsp { 
	__be32 residual_transfer_count;

	__be32 reserved[4];

	__be16 sense_data_len;

	u8 sense_data[18];

	u8 sense_data[RESPONSE_UPIU_SENSE_DATA_LENGTH];

};



/**

drivers/scsi/ufs/ufshcd.c

+19 −6
Original line number Diff line number Diff line
@@ -901,10 +901,14 @@ static inline void ufshcd_copy_sense_data(struct ufshcd_lrb *lrbp) 
	int len;

	if (lrbp->sense_buffer &&

	    ufshcd_get_rsp_upiu_data_seg_len(lrbp->ucd_rsp_ptr)) {

		int len_to_copy;



		len = be16_to_cpu(lrbp->ucd_rsp_ptr->sr.sense_data_len);

		len_to_copy = min_t(int, RESPONSE_UPIU_SENSE_DATA_LENGTH, len);



		memcpy(lrbp->sense_buffer,

			lrbp->ucd_rsp_ptr->sr.sense_data,

			min_t(int, len, SCSI_SENSE_BUFFERSIZE));

			min_t(int, len_to_copy, SCSI_SENSE_BUFFERSIZE));

	}

}
@@ -6373,7 +6377,10 @@ EXPORT_SYMBOL(ufshcd_system_suspend); 


int ufshcd_system_resume(struct ufs_hba *hba)

{

	if (!hba || !hba->is_powered || pm_runtime_suspended(hba->dev))

	if (!hba)

		return -EINVAL;



	if (!hba->is_powered || pm_runtime_suspended(hba->dev))

		/*

		 * Let the runtime resume take care of resuming

		 * if runtime suspended.
@@ -6394,7 +6401,10 @@ EXPORT_SYMBOL(ufshcd_system_resume); 
 */

int ufshcd_runtime_suspend(struct ufs_hba *hba)

{

	if (!hba || !hba->is_powered)

	if (!hba)

		return -EINVAL;



	if (!hba->is_powered)

		return 0;



	return ufshcd_suspend(hba, UFS_RUNTIME_PM);
@@ -6424,9 +6434,12 @@ EXPORT_SYMBOL(ufshcd_runtime_suspend); 
 */

int ufshcd_runtime_resume(struct ufs_hba *hba)

{

	if (!hba || !hba->is_powered)

	if (!hba)

		return -EINVAL;



	if (!hba->is_powered)

		return 0;

	else



	return ufshcd_resume(hba, UFS_RUNTIME_PM);

}

EXPORT_SYMBOL(ufshcd_runtime_resume);