| Message ID | 20220120092715.7805-1-ptesarik@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] Allow setting up to 8 bytes with the generic loader | expand |
On Thu, Jan 20, 2022 at 7:57 PM Petr Tesarik <ptesarik@suse.com> wrote: > > The documentation for the generic loader says that "the maximum size of > the data is 8 bytes". However, attempts to set data-len=8 trigger the > following assertion failure: > > ../hw/core/generic-loader.c:59: generic_loader_reset: Assertion `s->data_len < sizeof(s->data)' failed. > > The type of s->data is uint64_t (i.e. 8 bytes long), so I believe this > assert should use <= instead of <. > > Fixes: e481a1f63c93 ("generic-loader: Add a generic loader") > Signed-off-by: Petr Tesarik <ptesarik@suse.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/core/generic-loader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c > index 9a24ffb880..504ed7ca72 100644 > --- a/hw/core/generic-loader.c > +++ b/hw/core/generic-loader.c > @@ -56,7 +56,7 @@ static void generic_loader_reset(void *opaque) > } > > if (s->data_len) { > - assert(s->data_len < sizeof(s->data)); > + assert(s->data_len <= sizeof(s->data)); > dma_memory_write(s->cpu->as, s->addr, &s->data, s->data_len, > MEMTXATTRS_UNSPECIFIED); > } > -- > 2.31.1 > >
On Thu, Jan 20, 2022 at 7:57 PM Petr Tesarik <ptesarik@suse.com> wrote: > > The documentation for the generic loader says that "the maximum size of > the data is 8 bytes". However, attempts to set data-len=8 trigger the > following assertion failure: > > ../hw/core/generic-loader.c:59: generic_loader_reset: Assertion `s->data_len < sizeof(s->data)' failed. > > The type of s->data is uint64_t (i.e. 8 bytes long), so I believe this > assert should use <= instead of <. > > Fixes: e481a1f63c93 ("generic-loader: Add a generic loader") > Signed-off-by: Petr Tesarik <ptesarik@suse.com> Thanks! Applied to riscv-to-apply.next Alistair > --- > hw/core/generic-loader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c > index 9a24ffb880..504ed7ca72 100644 > --- a/hw/core/generic-loader.c > +++ b/hw/core/generic-loader.c > @@ -56,7 +56,7 @@ static void generic_loader_reset(void *opaque) > } > > if (s->data_len) { > - assert(s->data_len < sizeof(s->data)); > + assert(s->data_len <= sizeof(s->data)); > dma_memory_write(s->cpu->as, s->addr, &s->data, s->data_len, > MEMTXATTRS_UNSPECIFIED); > } > -- > 2.31.1 > >
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 9a24ffb880..504ed7ca72 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -56,7 +56,7 @@ static void generic_loader_reset(void *opaque) } if (s->data_len) { - assert(s->data_len < sizeof(s->data)); + assert(s->data_len <= sizeof(s->data)); dma_memory_write(s->cpu->as, s->addr, &s->data, s->data_len, MEMTXATTRS_UNSPECIFIED); }
The documentation for the generic loader says that "the maximum size of the data is 8 bytes". However, attempts to set data-len=8 trigger the following assertion failure: ../hw/core/generic-loader.c:59: generic_loader_reset: Assertion `s->data_len < sizeof(s->data)' failed. The type of s->data is uint64_t (i.e. 8 bytes long), so I believe this assert should use <= instead of <. Fixes: e481a1f63c93 ("generic-loader: Add a generic loader") Signed-off-by: Petr Tesarik <ptesarik@suse.com> --- hw/core/generic-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)