Commit 6d2b8750 authored Jun 20, 2018 by Dan Carpenter Committed by Greg Kroah-Hartman Aug 24, 2018

block: sed-opal: Fix a couple off by one bugs



[ Upstream commit ce042c183bcb94eb2919e8036473a1fc203420f9 ]

resp->num is the number of tokens in resp->tok[].  It gets set in
response_parse().  So if n == resp->num then we're reading beyond the
end of the data.

Fixes: 455a7b23 ("block: Add Sed-opal library")
Reviewed-by: Scott Bauer <scott.bauer@intel.com>
Tested-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 955887c1

block/sed-opal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -877,7 +877,7 @@ static size_t response_get_string(const struct parsed_resp *resp, int n,
		return 0;
		}

		if (n > resp->num) {
		if (n >= resp->num) {
		pr_debug("Response has %d tokens. Can't access %d\n",
		resp->num, n);
		return 0;
		@@ -899,7 +899,7 @@ static u64 response_get_u64(const struct parsed_resp *resp, int n)
		return 0;
		}

		if (n > resp->num) {
		if (n >= resp->num) {
		pr_debug("Response has %d tokens. Can't access %d\n",
		resp->num, n);
		return 0;