s390/dasd: Use struct_size() helper
Subsystems (2)
PATCH 1/1 s390/dasd: Use struct_size() helper
Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. Also, remove unnecessary variable _datasize_.
This code was detected with the help of Coccinelle and, audited and fixed manually.
--- drivers/s390/block/dasd_diag.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/s390/block/dasd_diag.c +3 -5
@@ -506,7 +506,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,struct req_iterator iter;struct bio_vec bv;char *dst; -unsigned int count, datasize; +unsigned int count;sector_t recid, first_rec, last_rec;unsigned int blksize, off;unsigned char rw_cmd;
@@ -534,10 +534,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,if (count != last_rec - first_rec +1 )return ERR_PTR (-EINVAL );/* Build the request */ - datasize =sizeof (struct dasd_diag_req ) + - count*sizeof (struct dasd_diag_bio ); - cqr =dasd_smalloc_request (DASD_DIAG_MAGIC ,0 , datasize, memdev, -blk_mq_rq_to_pdu (req)); + cqr =dasd_smalloc_request (DASD_DIAG_MAGIC ,0 ,struct_size (dreq, bio, count), + memdev,blk_mq_rq_to_pdu (req));if (IS_ERR (cqr))return cqr;
Signature · 1 line
2.27.0
Stefan Haberland
maintainerAm 19.06.20 um 18:56 schrieb Gustavo A. R. Silva:
Quoted 8 lines
Make use of the
struct_size()helper instead of an open-coded version in order to avoid any potential type mistakes. Also, remove unnecessary variable _datasize_.This code was detected with the help of Coccinelle and, audited and fixed manually.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Thanks for the patch.
Tested and applied.
Quoted 30 lines
--- drivers/s390/block/dasd_diag.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/s390/block/dasd_diag.c +3
-5@@ -506,7 +506,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,struct req_iterator iter;struct bio_vec bv;char *dst; -unsigned int count, datasize; +unsigned int count;sector_t recid, first_rec, last_rec;unsigned int blksize, off;unsigned char rw_cmd;@@ -534,10 +534,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,if (count != last_rec - first_rec +1 )return ERR_PTR (-EINVAL );/* Build the request */ - datasize =sizeof (struct dasd_diag_req ) + - count*sizeof (struct dasd_diag_bio ); - cqr =dasd_smalloc_request (DASD_DIAG_MAGIC ,0 , datasize, memdev, -blk_mq_rq_to_pdu (req)); + cqr =dasd_smalloc_request (DASD_DIAG_MAGIC ,0 ,struct_size (dreq, bio, count), + memdev,blk_mq_rq_to_pdu (req));if (IS_ERR (cqr))return cqr;
Quoted 5 lines · Stefan Haberland
Am 19.06.20 um 18:56 schrieb Gustavo A. R. Silva:
Quoted 4 lines
Make use of the
struct_size()helper instead of an open-coded version in order to avoid any potential type mistakes. Also, remove unnecessary variable _datasize_.
Quoted 7 lines
Quoted 4 lines
This code was detected with the help of Coccinelle and, audited and fixed manually.
Signed-off-by Gustavo A. R. Silva <[email protected]>Thanks for the patch.
Tested and applied.
Thanks, Stefan.
--
Gustavo