Skip to content

Commit cdd9738

Browse files
error27kuba-moo
authored andcommitted
net: mvneta: Fix an out of bounds check
In an earlier commit, I added a bounds check to prevent an out of bounds read and a WARN(). On further discussion and consideration that check was probably too aggressive. Instead of returning -EINVAL, a better fix would be to just prevent the out of bounds read but continue the process. Background: The value of "pp->rxq_def" is a number between 0-7 by default, or even higher depending on the value of "rxq_number", which is a module parameter. If the value is more than the number of available CPUs then it will trigger the WARN() in cpu_max_bits_warn(). Fixes: e8b4fc1 ("net: mvneta: Prevent out of bounds read in mvneta_config_rss()") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Link: https://lore.kernel.org/r/Y5A7d1E5ccwHTYPf@kadam Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ed14e59 commit cdd9738

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/net/ethernet/marvell/mvneta.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4271,7 +4271,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp)
42714271
/* Use the cpu associated to the rxq when it is online, in all
42724272
* the other cases, use the cpu 0 which can't be offline.
42734273
*/
4274-
if (cpu_online(pp->rxq_def))
4274+
if (pp->rxq_def < nr_cpu_ids && cpu_online(pp->rxq_def))
42754275
elected_cpu = pp->rxq_def;
42764276

42774277
max_cpu = num_present_cpus();
@@ -4927,9 +4927,6 @@ static int mvneta_config_rss(struct mvneta_port *pp)
49274927
napi_disable(&pp->napi);
49284928
}
49294929

4930-
if (pp->indir[0] >= nr_cpu_ids)
4931-
return -EINVAL;
4932-
49334930
pp->rxq_def = pp->indir[0];
49344931

49354932
/* Update unicast mapping */

0 commit comments

Comments
 (0)