summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mfiutil
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2012-06-20 17:20:25 +0000
committermjacob <mjacob@FreeBSD.org>2012-06-20 17:20:25 +0000
commit3d41a91978714ce2f467baf0c969a46da9e33131 (patch)
tree8f4dbc0e94505118d5e9faade7368a4bb0c0082c /usr.sbin/mfiutil
parent188f5a213364ae4d7d550683a2fdcb51d7c9e743 (diff)
downloadFreeBSD-src-3d41a91978714ce2f467baf0c969a46da9e33131.zip
FreeBSD-src-3d41a91978714ce2f467baf0c969a46da9e33131.tar.gz
Fix ARM compilation issue.
X-MFC: 237260
Diffstat (limited to 'usr.sbin/mfiutil')
-rw-r--r--usr.sbin/mfiutil/mfi_drive.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/mfiutil/mfi_drive.c b/usr.sbin/mfiutil/mfi_drive.c
index d456289..1927fac 100644
--- a/usr.sbin/mfiutil/mfi_drive.c
+++ b/usr.sbin/mfiutil/mfi_drive.c
@@ -330,11 +330,13 @@ cam_strvis(char *dst, const char *src, int srclen, int dstlen)
const char *
mfi_pd_inq_string(struct mfi_pd_info *info)
{
- struct scsi_inquiry_data *inq_data;
+ struct scsi_inquiry_data iqd, *inq_data = &iqd;
char vendor[16], product[48], revision[16], rstr[12], serial[SID_VENDOR_SPECIFIC_0_SIZE];
static char inq_string[64];
- inq_data = (struct scsi_inquiry_data *)info->inquiry_data;
+ memcpy(inq_data, info->inquiry_data,
+ (sizeof (iqd) < sizeof (info->inquiry_data))?
+ sizeof (iqd) : sizeof (info->inquiry_data));
if (SID_QUAL_IS_VENDOR_UNIQUE(inq_data))
return (NULL);
if (SID_TYPE(inq_data) != T_DIRECT)
OpenPOWER on IntegriCloud