Skip to content

Commit

Permalink
ethernet: ti: am65-cpsw-qos: Use struct_size() in devm_kzalloc()
Browse files Browse the repository at this point in the history
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 _size_.

This code was detected with the help of Coccinelle and, audited and
fixed manually.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gustavo A. R. Silva authored and David S. Miller committed Jun 19, 2020
1 parent cc7a21b commit f362b70
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/ethernet/ti/am65-cpsw-qos.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,18 +505,16 @@ static int am65_cpsw_set_taprio(struct net_device *ndev, void *type_data)
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
struct tc_taprio_qopt_offload *taprio = type_data;
struct am65_cpsw_est *est_new;
size_t size;
int ret = 0;

if (taprio->cycle_time_extension) {
dev_err(&ndev->dev, "Failed to set cycle time extension");
return -EOPNOTSUPP;
}

size = sizeof(struct tc_taprio_sched_entry) * taprio->num_entries +
sizeof(struct am65_cpsw_est);

est_new = devm_kzalloc(&ndev->dev, size, GFP_KERNEL);
est_new = devm_kzalloc(&ndev->dev,
struct_size(est_new, taprio.entries, taprio->num_entries),
GFP_KERNEL);
if (!est_new)
return -ENOMEM;

Expand Down

0 comments on commit f362b70

Please sign in to comment.