Commit 540a5d85 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher

fm10k: fix possible null pointer deref after kcalloc

When writing a new default redirection table, we needed to populate
a new RSS table using ethtool_rxfh_indir_default. We populated this
table into a region of memory allocated using kcalloc, but never checked
this for NULL. Fix this by moving the default table generation into
fm10k_write_reta. If this function is passed a table, use it. Otherwise,
generate the default table using ethtool_rxfh_indir_default, 4 at at
time.

Fixes: 0ea7fae4 ("fm10k: use ethtool_rxfh_indir_default for default redirection table")
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 11ec36a9
...@@ -971,15 +971,29 @@ u32 fm10k_get_reta_size(struct net_device __always_unused *netdev) ...@@ -971,15 +971,29 @@ u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)
void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir) void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir)
{ {
u16 rss_i = interface->ring_feature[RING_F_RSS].indices;
struct fm10k_hw *hw = &interface->hw; struct fm10k_hw *hw = &interface->hw;
int i; u32 table[4];
int i, j;
/* record entries to reta table */ /* record entries to reta table */
for (i = 0; i < FM10K_RETA_SIZE; i++, indir += 4) { for (i = 0; i < FM10K_RETA_SIZE; i++) {
u32 reta = indir[0] | u32 reta, n;
(indir[1] << 8) |
(indir[2] << 16) | /* generate a new table if we weren't given one */
(indir[3] << 24); for (j = 0; j < 4; j++) {
if (indir)
n = indir[i + j];
else
n = ethtool_rxfh_indir_default(i + j, rss_i);
table[j] = n;
}
reta = table[0] |
(table[1] << 8) |
(table[2] << 16) |
(table[3] << 24);
if (interface->reta[i] == reta) if (interface->reta[i] == reta)
continue; continue;
......
...@@ -1927,8 +1927,7 @@ static void fm10k_assign_rings(struct fm10k_intfc *interface) ...@@ -1927,8 +1927,7 @@ static void fm10k_assign_rings(struct fm10k_intfc *interface)
static void fm10k_init_reta(struct fm10k_intfc *interface) static void fm10k_init_reta(struct fm10k_intfc *interface)
{ {
u16 i, rss_i = interface->ring_feature[RING_F_RSS].indices; u16 i, rss_i = interface->ring_feature[RING_F_RSS].indices;
struct net_device *netdev = interface->netdev; u32 reta;
u32 reta, *indir;
/* If the Rx flow indirection table has been configured manually, we /* If the Rx flow indirection table has been configured manually, we
* need to maintain it when possible. * need to maintain it when possible.
...@@ -1953,16 +1952,7 @@ static void fm10k_init_reta(struct fm10k_intfc *interface) ...@@ -1953,16 +1952,7 @@ static void fm10k_init_reta(struct fm10k_intfc *interface)
} }
repopulate_reta: repopulate_reta:
indir = kcalloc(fm10k_get_reta_size(netdev), fm10k_write_reta(interface, NULL);
sizeof(indir[0]), GFP_KERNEL);
/* generate redirection table using the default kernel policy */
for (i = 0; i < fm10k_get_reta_size(netdev); i++)
indir[i] = ethtool_rxfh_indir_default(i, rss_i);
fm10k_write_reta(interface, indir);
kfree(indir);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment