[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MERGED PATCH v2 2/5] hw/scsi/spapr_vscsi: Use SRP_MAX_IU_LEN instead of
From: |
Philippe Mathieu-Daudé |
Subject: |
[MERGED PATCH v2 2/5] hw/scsi/spapr_vscsi: Use SRP_MAX_IU_LEN instead of sizeof flexible array |
Date: |
Thu, 5 Mar 2020 09:31:32 +0100 |
Replace sizeof() flexible arrays union srp_iu/viosrp_iu by the
SRP_MAX_IU_LEN definition, which is what this code actually meant
to use.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
Patch already applied to ppc-for-5.0.
hw/scsi/spapr_vscsi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 7d584e7732..7e397ed797 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -671,8 +671,8 @@ static void vscsi_process_login(VSCSIState *s, vscsi_req
*req)
*/
rsp->req_lim_delta = cpu_to_be32(VSCSI_REQ_LIMIT-2);
rsp->tag = tag;
- rsp->max_it_iu_len = cpu_to_be32(sizeof(union srp_iu));
- rsp->max_ti_iu_len = cpu_to_be32(sizeof(union srp_iu));
+ rsp->max_it_iu_len = cpu_to_be32(SRP_MAX_IU_LEN);
+ rsp->max_ti_iu_len = cpu_to_be32(SRP_MAX_IU_LEN);
/* direct and indirect */
rsp->buf_fmt = cpu_to_be16(SRP_BUF_FORMAT_DIRECT |
SRP_BUF_FORMAT_INDIRECT);
@@ -1088,7 +1088,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_crq
*crq)
* in our 256 bytes IUs. If not we'll have to increase the size
* of the structure.
*/
- if (crq->s.IU_length > sizeof(union viosrp_iu)) {
+ if (crq->s.IU_length > SRP_MAX_IU_LEN) {
fprintf(stderr, "VSCSI: SRP IU too long (%d bytes) !\n",
crq->s.IU_length);
vscsi_put_req(req);
--
2.21.1
- [PATCH v2 0/5] hw/scsi/spapr_vscsi: Fix time bomb zero-length array use, Philippe Mathieu-Daudé, 2020/03/05
- [MERGED PATCH v2 1/5] hw/scsi/viosrp: Add missing 'hw/scsi/srp.h' include, Philippe Mathieu-Daudé, 2020/03/05
- [MERGED PATCH v2 2/5] hw/scsi/spapr_vscsi: Use SRP_MAX_IU_LEN instead of sizeof flexible array,
Philippe Mathieu-Daudé <=
- [PATCH v2 4/5] hw/scsi/spapr_vscsi: Introduce req_iu() helper, Philippe Mathieu-Daudé, 2020/03/05
- [MERGED PATCH v2 3/5] hw/scsi/spapr_vscsi: Simplify a bit, Philippe Mathieu-Daudé, 2020/03/05
- [PATCH v2 5/5] hw/scsi/spapr_vscsi: Do not mix SRP IU size with DMA buffer size, Philippe Mathieu-Daudé, 2020/03/05
- Re: [PATCH v2 0/5] hw/scsi/spapr_vscsi: Fix time bomb zero-length array use, Paolo Bonzini, 2020/03/05