|
 |
dc245c |
From 0a7c084603663a1e63b01bd677429a20bc7d4c62 Mon Sep 17 00:00:00 2001
|
|
|
dc245c |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
dc245c |
Date: Mon, 1 Jul 2013 15:57:44 +0200
|
|
|
dc245c |
Subject: [RHEL7 libiscsi PATCH 09/18] scsi-lowlevel: do not use unsafe pointer casts
|
|
|
dc245c |
|
|
|
dc245c |
Casting unsigned char * pointers to uint32_t * may cause wrong
|
|
|
dc245c |
results if the pointers are not correctly aligned. Instead,
|
|
|
dc245c |
build up the big-endian values from each byte with multiple
|
|
|
dc245c |
dereferences of the original pointer.
|
|
|
dc245c |
|
|
|
dc245c |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
dc245c |
(cherry-picked from upstream commit 0a7c084603663a1e63b01bd677429a20bc7d4c62)
|
|
|
dc245c |
---
|
|
|
dc245c |
lib/scsi-lowlevel.c | 36 +++++++++++++++++++++---------------
|
|
|
dc245c |
1 file changed, 21 insertions(+), 15 deletions(-)
|
|
|
dc245c |
|
|
|
dc245c |
diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
|
|
|
dc245c |
index ad94eef..37f41d5 100644
|
|
|
dc245c |
--- a/lib/scsi-lowlevel.c
|
|
|
dc245c |
+++ b/lib/scsi-lowlevel.c
|
|
|
dc245c |
@@ -212,10 +212,10 @@ scsi_get_uint64(const unsigned char *c)
|
|
|
dc245c |
{
|
|
|
dc245c |
uint64_t val;
|
|
|
dc245c |
|
|
|
dc245c |
- val = ntohl(*(uint32_t *)c);
|
|
|
dc245c |
+ val = scsi_get_uint32(c);
|
|
|
dc245c |
val <<= 32;
|
|
|
dc245c |
c += 4;
|
|
|
dc245c |
- val |= ntohl(*(uint32_t *)c);
|
|
|
dc245c |
+ val |= scsi_get_uint32(c);
|
|
|
dc245c |
|
|
|
dc245c |
return val;
|
|
|
dc245c |
}
|
|
|
dc245c |
@@ -223,13 +223,21 @@ scsi_get_uint64(const unsigned char *c)
|
|
|
dc245c |
inline uint32_t
|
|
|
dc245c |
scsi_get_uint32(const unsigned char *c)
|
|
|
dc245c |
{
|
|
|
dc245c |
- return ntohl(*(uint32_t *)c);
|
|
|
dc245c |
+ uint32_t val;
|
|
|
dc245c |
+ val = c[0];
|
|
|
dc245c |
+ val = (val << 8) | c[1];
|
|
|
dc245c |
+ val = (val << 8) | c[2];
|
|
|
dc245c |
+ val = (val << 8) | c[3];
|
|
|
dc245c |
+ return val;
|
|
|
dc245c |
}
|
|
|
dc245c |
|
|
|
dc245c |
inline uint16_t
|
|
|
dc245c |
scsi_get_uint16(const unsigned char *c)
|
|
|
dc245c |
{
|
|
|
dc245c |
- return ntohs(*(uint16_t *)c);
|
|
|
dc245c |
+ uint16_t val;
|
|
|
dc245c |
+ val = c[0];
|
|
|
dc245c |
+ val = (val << 8) | c[1];
|
|
|
dc245c |
+ return val;
|
|
|
dc245c |
}
|
|
|
dc245c |
|
|
|
dc245c |
static inline uint64_t
|
|
|
dc245c |
@@ -237,14 +245,8 @@ task_get_uint64(struct scsi_task *task, int offset)
|
|
|
dc245c |
{
|
|
|
dc245c |
if (offset <= task->datain.size - 8) {
|
|
|
dc245c |
const unsigned char *c = &task->datain.data[offset];
|
|
|
dc245c |
- uint64_t val;
|
|
|
dc245c |
|
|
|
dc245c |
- val = ntohl(*(uint32_t *)c);
|
|
|
dc245c |
- val <<= 32;
|
|
|
dc245c |
- c += 4;
|
|
|
dc245c |
- val |= ntohl(*(uint32_t *)c);
|
|
|
dc245c |
-
|
|
|
dc245c |
- return val;
|
|
|
dc245c |
+ return scsi_get_uint64(c);
|
|
|
dc245c |
} else {
|
|
|
dc245c |
return 0;
|
|
|
dc245c |
}
|
|
|
dc245c |
@@ -256,7 +258,7 @@ task_get_uint32(struct scsi_task *task, int offset)
|
|
|
dc245c |
if (offset <= task->datain.size - 4) {
|
|
|
dc245c |
const unsigned char *c = &task->datain.data[offset];
|
|
|
dc245c |
|
|
|
dc245c |
- return ntohl(*(uint32_t *)c);
|
|
|
dc245c |
+ return scsi_get_uint32(c);
|
|
|
dc245c |
} else {
|
|
|
dc245c |
return 0;
|
|
|
dc245c |
}
|
|
|
dc245c |
@@ -268,7 +270,7 @@ task_get_uint16(struct scsi_task *task, int offset)
|
|
|
dc245c |
if (offset <= task->datain.size - 2) {
|
|
|
dc245c |
const unsigned char *c = &task->datain.data[offset];
|
|
|
dc245c |
|
|
|
dc245c |
- return ntohs(*(uint16_t *)c);
|
|
|
dc245c |
+ return scsi_get_uint16(c);
|
|
|
dc245c |
} else {
|
|
|
dc245c |
return 0;
|
|
|
dc245c |
}
|
|
|
dc245c |
@@ -300,13 +302,17 @@ scsi_set_uint64(unsigned char *c, uint64_t v)
|
|
|
dc245c |
inline void
|
|
|
dc245c |
scsi_set_uint32(unsigned char *c, uint32_t val)
|
|
|
dc245c |
{
|
|
|
dc245c |
- *(uint32_t *)c = htonl(val);
|
|
|
dc245c |
+ c[0] = val >> 24;
|
|
|
dc245c |
+ c[1] = val >> 16;
|
|
|
dc245c |
+ c[2] = val >> 8;
|
|
|
dc245c |
+ c[3] = val;
|
|
|
dc245c |
}
|
|
|
dc245c |
|
|
|
dc245c |
inline void
|
|
|
dc245c |
scsi_set_uint16(unsigned char *c, uint16_t val)
|
|
|
dc245c |
{
|
|
|
dc245c |
- *(uint16_t *)c = htons(val);
|
|
|
dc245c |
+ c[0] = val >> 8;
|
|
|
dc245c |
+ c[1] = val;
|
|
|
dc245c |
}
|
|
|
dc245c |
|
|
|
dc245c |
/*
|
|
|
dc245c |
--
|
|
|
dc245c |
1.8.1.4
|
|
|
dc245c |
|