From a91bf41af9e89ff0aa0b686ffbf9c0c3fb781c3c Mon Sep 17 00:00:00 2001
From: Tim Bird <tim.bird@am.sony.com>
Date: Wed, 8 Feb 2012 10:37:57 -0800
Subject: [PATCH] --- yaml --- r: 288916 b: refs/heads/master c:
 3bcfa431334d99fa8bff96c4e7c2108f0b26242e h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/android/logger.c | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ef523373a57b..1fd079a10990 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c626224de9370ae783e8b0cb6aaca2ba3d81fe62
+refs/heads/master: 3bcfa431334d99fa8bff96c4e7c2108f0b26242e
diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c
index 29ee13727220..1e9e638cfd7a 100644
--- a/trunk/drivers/staging/android/logger.c
+++ b/trunk/drivers/staging/android/logger.c
@@ -93,20 +93,24 @@ static inline struct logger_log *file_get_log(struct file *file)
  * get_entry_len - Grabs the length of the payload of the next entry starting
  * from 'off'.
  *
+ * An entry length is 2 bytes (16 bits) in host endian order.
+ * In the log, the length does not include the size of the log entry structure.
+ * This function returns the size including the log entry structure.
+ *
  * Caller needs to hold log->mutex.
  */
 static __u32 get_entry_len(struct logger_log *log, size_t off)
 {
 	__u16 val;
 
-	switch (log->size - off) {
-	case 1:
-		memcpy(&val, log->buffer + off, 1);
-		memcpy(((char *) &val) + 1, log->buffer, 1);
-		break;
-	default:
-		memcpy(&val, log->buffer + off, 2);
-	}
+	/* copy 2 bytes from buffer, in memcpy order, */
+	/* handling possible wrap at end of buffer */
+
+	((__u8 *)&val)[0] = log->buffer[off];
+	if (likely(off+1 < log->size))
+		((__u8 *)&val)[1] = log->buffer[off+1];
+	else
+		((__u8 *)&val)[1] = log->buffer[0];
 
 	return sizeof(struct logger_entry) + val;
 }