scsi: libsas: Fix array-bounds warnings
Subsystems (2)
PATCH 1/1 scsi: libsas: Fix array-bounds warnings
From: Bean Huo <[email protected]>
Use the latest GCC will show below array-bounds warning:
drivers/scsi/libsas/sas_expander.c:1697:39: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[56]’ [-Warray-bounds]
...drivers/scsi/libsas/sas_expander.c:1781:20: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...rivers/scsi/libsas/sas_expander.c:1786:39: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...drivers/scsi/libsas/sas_expander.c:476:35: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...drivers/scsi/libsas/sas_expander.c:479:38: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
This patch aims to fix these warnings by directly using struct sizes instead of macro definitions.
--- drivers/scsi/libsas/sas_expander.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/libsas/sas_expander.c +3 -3
@@ -457,7 +457,7 @@ static int sas_ex_general(struct domain_device *dev)if (!rg_req)return -ENOMEM ; - rg_resp =alloc_smp_resp (RG_RESP_SIZE ); + rg_resp =alloc_smp_resp (sizeof (struct smp_resp ));if (!rg_resp) {kfree (rg_req);return -ENOMEM ;
@@ -1688,7 +1688,7 @@ static int sas_get_phy_change_count(struct domain_device *dev,int res;struct smp_resp *disc_resp; - disc_resp =alloc_smp_resp (DISCOVER_RESP_SIZE ); + disc_resp =alloc_smp_resp (sizeof (struct smp_resp ));if (!disc_resp)return -ENOMEM ;
@@ -1766,7 +1766,7 @@ static int sas_get_ex_change_count(struct domain_device *dev, int *ecc)if (!rg_req)return -ENOMEM ; - rg_resp =alloc_smp_resp (RG_RESP_SIZE ); + rg_resp =alloc_smp_resp (sizeof (struct smp_resp ));if (!rg_resp) {kfree (rg_req);return -ENOMEM ;
Signature · 1 line
2.34.1
Quoted 3 lines · Bean Huo
From: Bean Huo <[email protected]>
Use the latest GCC will show below array-bounds warning:
Which version exactly?
Quoted 2 lines
drivers/scsi/libsas/sas_expander.c:1697:39: warning: array subscript ‘struct
What baseline do you use?
Quoted 1 line
smp_resp[0]’ is partly outside array bounds of ‘unsigned char[56]’ [-Warray-bounds]
I guess that the compiler is getting upset that we're only allocating 32 bytes for a struct which is 56 bytes in size.
Quoted 26 lines
...
drivers/scsi/libsas/sas_expander.c:1781:20: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...rivers/scsi/libsas/sas_expander.c:1786:39: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...drivers/scsi/libsas/sas_expander.c:476:35: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]
...drivers/scsi/libsas/sas_expander.c:479:38: warning: array subscript ‘struct smp_resp[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Warray-bounds]This patch aims to fix these warnings by directly using struct sizes instead of macro definitions.
Signed-off-by Bean Huo <[email protected]>--- drivers/scsi/libsas/sas_expander.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/scsi/libsas/sas_expander.c +0
-0
drivers/scsi/libsas/sas_expander.c static int sas_ex_general(struct domain_device *dev) · line 460
Quoted 5 lines
drivers/scsi/libsas/sas_expander.c +1
-1@@ -457,7 +457,7 @@ static int sas_ex_general(struct domain_device *dev)if (!rg_req)return -ENOMEM ; - rg_resp =alloc_smp_resp (RG_RESP_SIZE ); + rg_resp =alloc_smp_resp (sizeof (struct smp_resp ));
I'm thinking that it's better to have something like:
struct smp_resp_hdr {
u8 frame_type;
u8 function;
u8 result;
u8 reserved;
};struct smp_resp {
union {
struct report_general_resp rg;
struct discover_resp disc;
struct report_phy_sata_resp rps;
};
} __attribute__ ((packed));struct report_general_resp {
struct smp_resp_hdr hdr;
__be16 change_count;
__be16 route_indexes;
...
};or even also get rid of struct smp_resp holder. Sorry if this is more than you bargained for, but I don't mind helping.
Thanks,
John
Quoted 21 lines
drivers/scsi/libsas/sas_expander.c +2
-2if (!rg_resp) {kfree (rg_req);return -ENOMEM ;@@ -1688,7 +1688,7 @@ static int sas_get_phy_change_count(struct domain_device *dev,int res;struct smp_resp *disc_resp; - disc_resp =alloc_smp_resp (DISCOVER_RESP_SIZE ); + disc_resp =alloc_smp_resp (sizeof (struct smp_resp ));if (!disc_resp)return -ENOMEM ;@@ -1766,7 +1766,7 @@ static int sas_get_ex_change_count(struct domain_device *dev, int *ecc)if (!rg_req)return -ENOMEM ; - rg_resp =alloc_smp_resp (RG_RESP_SIZE ); + rg_resp =alloc_smp_resp (sizeof (struct smp_resp ));if (!rg_resp) {kfree (rg_req);return -ENOMEM ;