Commit e2821a50 authored by Jonas Rabenstein's avatar Jonas Rabenstein Committed by Jens Axboe

block: sed-opal: unify space check in add_token_*

All add_token_* functions have a common set of conditions that have to
be checked. Use a common function for those checks in order to avoid
different behaviour as well as code duplication.
Acked-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarScott Bauer <sbauer@plzdonthack.me>
Co-authored-by: default avatarDavid Kozub <zub@linux.fjfi.cvut.cz>
Signed-off-by: default avatarJonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Signed-off-by: default avatarDavid Kozub <zub@linux.fjfi.cvut.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1b6b75b0
...@@ -510,15 +510,24 @@ static int opal_discovery0(struct opal_dev *dev, void *data) ...@@ -510,15 +510,24 @@ static int opal_discovery0(struct opal_dev *dev, void *data)
return opal_discovery0_end(dev); return opal_discovery0_end(dev);
} }
static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok) static bool can_add(int *err, struct opal_dev *cmd, size_t len)
{ {
if (*err) if (*err)
return; return false;
if (cmd->pos >= IO_BUFFER_LENGTH - 1) {
pr_debug("Error adding u8: end of buffer.\n"); if (len > IO_BUFFER_LENGTH || cmd->pos > IO_BUFFER_LENGTH - len) {
pr_debug("Error adding %zu bytes: end of buffer.\n", len);
*err = -ERANGE; *err = -ERANGE;
return; return false;
} }
return true;
}
static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok)
{
if (!can_add(err, cmd, 1))
return;
cmd->cmd[cmd->pos++] = tok; cmd->cmd[cmd->pos++] = tok;
} }
...@@ -562,9 +571,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number) ...@@ -562,9 +571,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
msb = fls64(number); msb = fls64(number);
len = DIV_ROUND_UP(msb, 8); len = DIV_ROUND_UP(msb, 8);
if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) { if (!can_add(err, cmd, len + 1)) {
pr_debug("Error adding u64: end of buffer.\n"); pr_debug("Error adding u64: end of buffer.\n");
*err = -ERANGE;
return; return;
} }
add_short_atom_header(cmd, false, false, len); add_short_atom_header(cmd, false, false, len);
...@@ -586,9 +594,8 @@ static void add_token_bytestring(int *err, struct opal_dev *cmd, ...@@ -586,9 +594,8 @@ static void add_token_bytestring(int *err, struct opal_dev *cmd,
is_short_atom = false; is_short_atom = false;
} }
if (len >= IO_BUFFER_LENGTH - cmd->pos - header_len) { if (!can_add(err, cmd, header_len + len)) {
pr_debug("Error adding bytestring: end of buffer.\n"); pr_debug("Error adding bytestring: end of buffer.\n");
*err = -ERANGE;
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment