]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sfc: fix ef100 design-param checking
authorEdward Cree <ecree@solarflare.com>
Wed, 12 Aug 2020 09:32:49 +0000 (10:32 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Aug 2020 19:54:03 +0000 (12:54 -0700)
The handling of the RXQ/TXQ size granularity design-params had two
 problems: it had a 64-bit divide that didn't build on 32-bit platforms,
 and it could divide by zero if the NIC supplied 0 as the value of the
 design-param.  Fix both by checking for 0 and for a granularity bigger
 than our min-size; if the granularity <= EFX_MIN_DMAQ_SIZE then it fits
 in 32 bits, so we can cast it to u32 for the divide.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Edward Cree <ecree@solarflare.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/ef100_nic.c

index 36598d0542ed2291525b781ab97dfb6342ce91b4..206d70f9d95b0ac0e6992733b655cf9a861cfe3b 100644 (file)
@@ -979,7 +979,8 @@ static int ef100_process_design_param(struct efx_nic *efx,
                 * EFX_MIN_DMAQ_SIZE is divisible by GRANULARITY.
                 * This is very unlikely to fail.
                 */
-               if (EFX_MIN_DMAQ_SIZE % reader->value) {
+               if (!reader->value || reader->value > EFX_MIN_DMAQ_SIZE ||
+                   EFX_MIN_DMAQ_SIZE % (u32)reader->value) {
                        netif_err(efx, probe, efx->net_dev,
                                  "%s size granularity is %llu, can't guarantee safety\n",
                                  reader->type == ESE_EF100_DP_GZ_RXQ_SIZE_GRANULARITY ? "RXQ" : "TXQ",