summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-06-20 13:41:51 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-24 13:09:03 +0200
commit6d2b87505f7a59b464a59e1d0870aa26d0b1f0e1 (patch)
treeba2d71108d1e225c27795c660e4420d3bb2eff51 /block
parent955887c1fe90a2be056358001fd4920614a0f8b6 (diff)
downloadlinux-stable-6d2b87505f7a59b464a59e1d0870aa26d0b1f0e1.tar.gz
linux-stable-6d2b87505f7a59b464a59e1d0870aa26d0b1f0e1.tar.bz2
linux-stable-6d2b87505f7a59b464a59e1d0870aa26d0b1f0e1.zip
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: 455a7b238cd6 ("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>
Diffstat (limited to 'block')
-rw-r--r--block/sed-opal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/sed-opal.c b/block/sed-opal.c
index 9ed51d0c6b1d..4f5e70d4abc3 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -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;