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

Commit 5f990d31 authored by Jonas Rabenstein's avatar Jonas Rabenstein Committed by Jens Axboe
Browse files

block: sed-opal: fix u64 short atom length 



The length must be given as bytes and not as 4 bit tuples.

Reviewed-by: default avatarScott Bauer <scott.bauer@intel.com>
Signed-off-by: default avatarJonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 17cb960f

block/sed-opal.c

+4 −7
Original line number Diff line number Diff line
@@ -554,15 +554,14 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number) 


	size_t len;

	int msb;

	u8 n;



	if (!(number & ~TINY_ATOM_DATA_MASK)) {

		add_token_u8(err, cmd, number);

		return;

	}



	msb = fls(number);

	len = DIV_ROUND_UP(msb, 4);

	msb = fls64(number);

	len = DIV_ROUND_UP(msb, 8);



	if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) {

		pr_debug("Error adding u64: end of buffer.\n");
@@ -570,10 +569,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number) 
		return;

	}

	add_short_atom_header(cmd, false, false, len);

	while (len--) {

		n = number >> (len * 8);

		add_token_u8(err, cmd, n);

	}

	while (len--)

		add_token_u8(err, cmd, number >> (len * 8));

}



static void add_token_bytestring(int *err, struct opal_dev *cmd,