From 0896d52530e4dfee5b6013f7c8350eba3c9eee7a Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Wed, 20 Jun 2012 17:20:25 +0000 Subject: [PATCH] Fix ARM compilation issue. X-MFC: 237260 --- usr.sbin/mfiutil/mfi_drive.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mfiutil/mfi_drive.c b/usr.sbin/mfiutil/mfi_drive.c index d4562897fe35..1927facd67ab 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)