diff options
| author | Greg Joyce <gjoyce@linux.ibm.com> | 2024-02-16 15:04:17 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-02-16 15:52:45 -0700 |
| commit | 5429c8de56f6b2bd8f537df3a1e04e67b9c04282 (patch) | |
| tree | ad3d9dfb0697ecfb40e425d82b51f7b529e59c74 /block | |
| parent | 15afd3d332b845b54ff09d7522b552457162fe7c (diff) | |
| download | linux-stable-5429c8de56f6b2bd8f537df3a1e04e67b9c04282.tar.gz linux-stable-5429c8de56f6b2bd8f537df3a1e04e67b9c04282.tar.bz2 linux-stable-5429c8de56f6b2bd8f537df3a1e04e67b9c04282.zip | |
block: sed-opal: handle empty atoms when parsing response
The SED Opal response parsing function response_parse() does not
handle the case of an empty atom in the response. This causes
the entry count to be too high and the response fails to be
parsed. Recognizing, but ignoring, empty atoms allows response
handling to succeed.
Signed-off-by: Greg Joyce <gjoyce@linux.ibm.com>
Link: https://lore.kernel.org/r/20240216210417.3526064-2-gjoyce@linux.ibm.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/opal_proto.h | 1 | ||||
| -rw-r--r-- | block/sed-opal.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/block/opal_proto.h b/block/opal_proto.h index dec7ce3a3edb..d247a457bf6e 100644 --- a/block/opal_proto.h +++ b/block/opal_proto.h @@ -71,6 +71,7 @@ enum opal_response_token { #define SHORT_ATOM_BYTE 0xBF #define MEDIUM_ATOM_BYTE 0xDF #define LONG_ATOM_BYTE 0xE3 +#define EMPTY_ATOM_BYTE 0xFF #define OPAL_INVAL_PARAM 12 #define OPAL_MANUFACTURED_INACTIVE 0x08 diff --git a/block/sed-opal.c b/block/sed-opal.c index 3d9e9cd250bd..fa4dba5d8531 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -1056,16 +1056,20 @@ static int response_parse(const u8 *buf, size_t length, token_length = response_parse_medium(iter, pos); else if (pos[0] <= LONG_ATOM_BYTE) /* long atom */ token_length = response_parse_long(iter, pos); + else if (pos[0] == EMPTY_ATOM_BYTE) /* empty atom */ + token_length = 1; else /* TOKEN */ token_length = response_parse_token(iter, pos); if (token_length < 0) return token_length; + if (pos[0] != EMPTY_ATOM_BYTE) + num_entries++; + pos += token_length; total -= token_length; iter++; - num_entries++; } resp->num = num_entries; |