Skip to contentSkip to conversation

hexdump: fix for non-aligned buffers

PATCH Superseded =?UTF-8?q?Horacio=20Mijail=20Ant=C3=B3n=20Quiles?= 2 participants 2 messages Jun 21, 2015 – Jun 22, 2015 Library code

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hexdump: fix for non-aligned buffers

An hexdump with a buf not aligned to the groupsize causes non-naturally-aligned memory accesses. This was causing a kernel panic on the processor BlackFin BF527, when such an unaligned buffer was fed by the function ubifs_scanned_corruption in fs/ubifs/scan.c .

To fix this, if the buffer is not aligned to groupsize in a platform which does not define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS, then change the groupsize to 1, so alignment is no longer a problem.
This behavior is coherent with the way the function currently deals with inappropriate parameter combinations, which is to fall back to safe "defaults", even if that means changing the output format and the implicit access patterns that could have been expected.

---
Changes in v2:
- Followed Joe Perches' indication to use IS_ALIGNED() for readability
- Made the explanation, commit and code comments clearer (aligned vs naturally aligned)

 lib/hexdump.c | 5 +++++
 1 file changed, 5 insertions(+)
lib/hexdump.c +5 -0
index 7ea0969..fef4ee1 100644
@@ -123,6 +123,11 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
 		groupsize = 1;
 	if ((len % groupsize) != 0)	/* no mixed size output */
 		groupsize = 1;
+	
+	/* fall back to 1-byte groups if buf is not aligned to groupsize*/
+	if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&
+	    !IS_ALIGNED((uintptr_t)buf, groupsize))
+		groupsize = 1;
 
 	ngroups = len / groupsize;
 	ascii_column = rowsize * 2 + rowsize / groupsize + 1;
Signature · 5 lines
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/
#1 lore raw
Quoted 4 lines · On Mon, 2015-06-22 at 01:42 +0200, =?UTF-8?q?Horacio=20Mijail=20Ant=C3=B3n=20Qu…

An hexdump with a buf not aligned to the groupsize causes non-naturally-aligned memory accesses. This was causing a kernel panic on the processor BlackFin BF527, when such an unaligned buffer was fed by the function ubifs_scanned_corruption in fs/ubifs/scan.c .

[]

lib/hexdump.c

Quoted 1 line
lib/hexdump.c +0 -0

[]

lib/hexdump.c int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize, · line 127

Quoted 6 lines
lib/hexdump.c +2 -0
@@ -123,6 +123,11 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
 		groupsize = 1;
 	if ((len % groupsize) != 0)	/* no mixed size output */
 		groupsize = 1;
+	
+	/* fall back to 1-byte groups if buf is not aligned to groupsize*/

Please add a space before the "*/"

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/