p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: unisys: parser_init_guts(): standard_payload_header is always false 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-05-05 18:37:13 -04:00 committed by Greg Kroah-Hartman
parent 464129edbc
commit cc55b5c5a7
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -376,21 +376,20 @@ static void controlvm_respond_physdev_changestate(
static void parser_done(struct parser_context *ctx); static void parser_done(struct parser_context *ctx);
static struct parser_context * static struct parser_context *
parser_init_guts(u64 addr, u32 bytes, bool local, parser_init_guts(u64 addr, u32 bytes, bool local, bool *retry)
bool standard_payload_header, bool *retry)
{ {
int allocbytes = sizeof(struct parser_context) + bytes; int allocbytes = sizeof(struct parser_context) + bytes;
struct parser_context *rc = NULL; struct parser_context *rc = NULL;
struct parser_context *ctx = NULL; struct parser_context *ctx = NULL;
struct spar_controlvm_parameters_header *phdr = NULL;
if (retry) if (retry)
*retry = false; *retry = false;
if (!standard_payload_header)
/* alloc and 0 extra byte to ensure payload is /*
* '\0'-terminated * alloc an 0 extra byte to ensure payload is
*/ * '\0'-terminated
allocbytes++; */
allocbytes++;
if ((controlvm_payload_bytes_buffered + bytes) if ((controlvm_payload_bytes_buffered + bytes)
> MAX_CONTROLVM_PAYLOAD_BYTES) { > MAX_CONTROLVM_PAYLOAD_BYTES) {
if (retry) if (retry)
@ -437,26 +436,8 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
memcpy_fromio(ctx->data, mapping, bytes); memcpy_fromio(ctx->data, mapping, bytes);
release_mem_region(addr, bytes); release_mem_region(addr, bytes);
} }
if (!standard_payload_header) {
ctx->byte_stream = true;
rc = ctx;
goto cleanup;
}
phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
if (phdr->total_length != bytes) {
rc = NULL;
goto cleanup;
}
if (phdr->total_length < phdr->header_length) {
rc = NULL;
goto cleanup;
}
if (phdr->header_length <
sizeof(struct spar_controlvm_parameters_header)) {
rc = NULL;
goto cleanup;
}
ctx->byte_stream = true;
rc = ctx; rc = ctx;
cleanup: cleanup:
if (rc) { if (rc) {
@ -478,7 +459,7 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
static struct parser_context * static struct parser_context *
parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry) parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry)
{ {
return parser_init_guts(addr, bytes, local, false, retry); return parser_init_guts(addr, bytes, local, retry);
} }
static uuid_le static uuid_le