]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
dpaa2-eth: Fix potential spectre issue
authorIoana Radulescu <ruxandra.radulescu@nxp.com>
Fri, 24 May 2019 15:15:15 +0000 (18:15 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sun, 26 May 2019 20:41:33 +0000 (13:41 -0700)
Smatch reports a potential spectre vulnerability in the dpaa2-eth
driver, where the value of rxnfc->fs.location (which is provided
from user-space) is used as index in an array.

Add a call to array_index_nospec() to sanitize the access.

Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c

index 76bd8d2872cc8e2899e73a71d4f99822d60ed23a..7b182f4b263c4b969393cd705514c882fb60df11 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 #include <linux/net_tstamp.h>
+#include <linux/nospec.h>
 
 #include "dpni.h"      /* DPNI_LINK_OPT_* */
 #include "dpaa2-eth.h"
@@ -648,6 +649,8 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,
        case ETHTOOL_GRXCLSRULE:
                if (rxnfc->fs.location >= max_rules)
                        return -EINVAL;
+               rxnfc->fs.location = array_index_nospec(rxnfc->fs.location,
+                                                       max_rules);
                if (!priv->cls_rules[rxnfc->fs.location].in_use)
                        return -EINVAL;
                rxnfc->fs = priv->cls_rules[rxnfc->fs.location].fs;