Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6625d903 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dm integrity: use hex2bin instead of open-coded variant 



Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent e944e03e

drivers/md/dm-integrity.c

+2 −12
Original line number Diff line number Diff line
@@ -2496,8 +2496,6 @@ static int get_alg_and_key(const char *arg, struct alg_spec *a, char **error, ch 


	k = strchr(a->alg_string, ':');

	if (k) {

		unsigned i;



		*k = 0;

		a->key_string = k + 1;

		if (strlen(a->key_string) & 1)
@@ -2507,16 +2505,8 @@ static int get_alg_and_key(const char *arg, struct alg_spec *a, char **error, ch 
		a->key = kmalloc(a->key_size, GFP_KERNEL);

		if (!a->key)

			goto nomem;

		for (i = 0; i < a->key_size; i++) {

			char digit[3];

			digit[0] = a->key_string[i * 2];

			digit[1] = a->key_string[i * 2 + 1];

			digit[2] = 0;

			if (strspn(digit, "0123456789abcdefABCDEF") != 2)

		if (hex2bin(a->key, a->key_string, a->key_size))

			goto inval;

			if (kstrtou8(digit, 16, &a->key[i]))

				goto inval;

		}

	}



	return 0;