From: Shivasharan S Date: Fri, 10 Feb 2017 08:59:22 +0000 (-0800) Subject: scsi: megaraid_sas: avoid unaligned access in ioctl path X-Git-Tag: v4.1.12-102.0.20170601_1400~21 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dced8ea9e5504df51b2f8980cb8f5a133f6f4825;p=users%2Fjedix%2Flinux-maple.git scsi: megaraid_sas: avoid unaligned access in ioctl path Orabug: 26096381 Fix kernel warning for accessing unaligned memory access in driver. Signed-off-by: Shivasharan S Signed-off-by: Kashyap Desai Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl Signed-off-by: Martin K. Petersen (cherry picked from commit 318aaef88353c09a73d26d3b87a74fab67ff9282) Signed-off-by: Somasundaram Krishnasamy Signed-off-by: Kirtikar Kashyap Reviewed-by: Dhaval Giani Conflicts: drivers/scsi/megaraid/megaraid_sas_base.c --- diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index b0ad619cce5a9..eecba7726ecdf 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -6825,8 +6825,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, sense_ptr = (unsigned long *) ((unsigned long)ioc->frame.raw + ioc->sense_off); - unsigned long tmp = get_unaligned((unsigned long *) sense_ptr); - if (copy_to_user((void __user *)((unsigned long)tmp), + if (copy_to_user((void __user *)((unsigned long) + get_unaligned((unsigned long *)sense_ptr)), sense, ioc->sense_len)) { dev_err(&instance->pdev->dev, "Failed to copy out to user " "sense data\n");