Skip to content

Commit 0201409

Browse files
GustavoARSilvadavem330
authored andcommitted
net: spider_net: Use size_add() in call to struct_size()
If, for any reason, the open-coded arithmetic causes a wraparound, the protection that `struct_size()` adds against potential integer overflows is defeated. Fix this by hardening call to `struct_size()` with `size_add()`. Fixes: 3f1071e ("net: spider_net: Use struct_size() helper") Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 2506a91 commit 0201409

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/toshiba/spider_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2332,7 +2332,7 @@ spider_net_alloc_card(void)
23322332
struct spider_net_card *card;
23332333

23342334
netdev = alloc_etherdev(struct_size(card, darray,
2335-
tx_descriptors + rx_descriptors));
2335+
size_add(tx_descriptors, rx_descriptors)));
23362336
if (!netdev)
23372337
return NULL;
23382338

0 commit comments

Comments
 (0)