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

Link: https://github.com/KSPP/linux/issues/174
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20220125232525.GA80228@embeddedor
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/comedi/drivers/das16.c b/drivers/comedi/drivers/das16.c
index 937a69ce09770f899d0d41dcbd0e337dc9861159..728dc02156c87d9aabf2c2ad1652e56eadf75a68 100644 (file)
--- a/drivers/comedi/drivers/das16.c
+++ b/drivers/comedi/drivers/das16.c
@@ -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;