Skip to contentSkip to conversation

comedi: das16: Use struct_size() helper in comedi_alloc_spriv()

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Jan 25, 2022 – Jan 26, 2022 Comedi drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 comedi: das16: Use struct_size() helper in comedi_alloc_spriv()

Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows.

Also, address the following sparse warnings:
drivers/comedi/drivers/das16.c:964:45: warning: using sizeof on a flexible structure drivers/comedi/drivers/das16.c:998:45: warning: using sizeof on a flexible structure

---
 drivers/comedi/drivers/das16.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/comedi/drivers/das16.c +2 -2
index 937a69ce0977..728dc02156c8 100644
@@ -961,7 +961,7 @@ static const struct comedi_lrange *das16_ai_range(struct comedi_device *dev,
 
 		/* allocate single-range range table */
 		lrange = comedi_alloc_spriv(s,
-					    sizeof(*lrange) + sizeof(*krange));
+					    struct_size(lrange, range, 1));
 		if (!lrange)
 			return &range_unknown;
 
@@ -995,7 +995,7 @@ static const struct comedi_lrange *das16_ao_range(struct comedi_device *dev,
 
 		/* allocate single-range range table */
 		lrange = comedi_alloc_spriv(s,
-					    sizeof(*lrange) + sizeof(*krange));
+					    struct_size(lrange, range, 1));
 		if (!lrange)
 			return &range_unknown;
 
Signature · 1 line
2.27.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 28 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worst scenario, could lead to heap overflows.

Also, address the following sparse warnings:
drivers/comedi/drivers/das16.c:964:45: warning: using sizeof on a flexible structure drivers/comedi/drivers/das16.c:998:45: warning: using sizeof on a flexible structure

---
  drivers/comedi/drivers/das16.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/comedi/drivers/das16.c +1 -1
index 937a69ce0977..728dc02156c8 100644
@@ -961,7 +961,7 @@ static const struct comedi_lrange *das16_ai_range(struct comedi_device *dev,
 
  		/* allocate single-range range table */
  		lrange = comedi_alloc_spriv(s,
-					    sizeof(*lrange) + sizeof(*krange));
+					    struct_size(lrange, range, 1));
  		if (!lrange)
  			return &range_unknown;
 

drivers/comedi/drivers/das16.c static const struct comedi_lrange *das16_ao_range(struct comedi_device *dev, · line 1001

Quoted 8 lines
drivers/comedi/drivers/das16.c +1 -1
@@ -995,7 +995,7 @@ static const struct comedi_lrange *das16_ao_range(struct comedi_device *dev,
 
  		/* allocate single-range range table */
  		lrange = comedi_alloc_spriv(s,
-					    sizeof(*lrange) + sizeof(*krange));
+					    struct_size(lrange, range, 1));
  		if (!lrange)
  			return &range_unknown;
 

Looks like a nice tidy-up, thanks!

(Note, I do not have anywhere to commit it, personally.)

Signature · 4 lines
-=( Ian Abbott <[email protected]> || MEV Ltd. is a company  )=-
-=( registered in England & Wales.  Regd. number: 02862268.  )=-
-=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=-
-=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-