Commit bc9dc9d5 authored May 30, 2016 by Bjørn Mork Committed by Linus Torvalds May 30, 2016

lib/uuid.c: use correct offset in uuid parser



Use '+ 0' and '+ 1' as offsets, like they were intended, instead of
adding to the result.

Fixes: 2b1b0d66 ("lib/uuid.c: introduce a few more generic helpers")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cfaff0e5

lib/uuid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -106,8 +106,8 @@ static int __uuid_to_bin(const char *uuid, __u8 b[16], const u8 ei[16])
		return -EINVAL;

		for (i = 0; i < 16; i++) {
		int hi = hex_to_bin(uuid[si[i]] + 0);
		int lo = hex_to_bin(uuid[si[i]] + 1);
		int hi = hex_to_bin(uuid[si[i] + 0]);
		int lo = hex_to_bin(uuid[si[i] + 1]);

		b[ei[i]] = (hi << 4) \| lo;
		}

Admin message