diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-04-15 16:57:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-17 00:01:45 -0400 |
commit | 899537b73557aafbdd11050b501cf54b4f5c45af (patch) | |
tree | fb231860e44e0e39982d5bf475c569b79bce1003 /net/atm/lec.c | |
parent | ad910c7c01269f229a97c335f2dc669fff750f65 (diff) |
net: atm: Fix potential Spectre v1 vulnerabilities
arg is controlled by user-space, hence leading to a potential
exploitation of the Spectre variant 1 vulnerability.
This issue was detected with the help of Smatch:
net/atm/lec.c:715 lec_mcast_attach() warn: potential spectre issue 'dev_lec' [r] (local cap)
Fix this by sanitizing arg before using it to index dev_lec.
Notice that given that speculation windows are large, the policy is
to kill the speculation on the first load and not worry if it can be
completed with a dependent load/store [1].
[1] https://lore.kernel.org/lkml/20180423164740.GY17484@dhcp22.suse.cz/
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r-- | net/atm/lec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index d7f5cf5b7594..ad4f829193f0 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -710,7 +710,10 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg) | |||
710 | 710 | ||
711 | static int lec_mcast_attach(struct atm_vcc *vcc, int arg) | 711 | static int lec_mcast_attach(struct atm_vcc *vcc, int arg) |
712 | { | 712 | { |
713 | if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg]) | 713 | if (arg < 0 || arg >= MAX_LEC_ITF) |
714 | return -EINVAL; | ||
715 | arg = array_index_nospec(arg, MAX_LEC_ITF); | ||
716 | if (!dev_lec[arg]) | ||
714 | return -EINVAL; | 717 | return -EINVAL; |
715 | vcc->proto_data = dev_lec[arg]; | 718 | vcc->proto_data = dev_lec[arg]; |
716 | return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc); | 719 | return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc); |
@@ -728,6 +731,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg) | |||
728 | i = arg; | 731 | i = arg; |
729 | if (arg >= MAX_LEC_ITF) | 732 | if (arg >= MAX_LEC_ITF) |
730 | return -EINVAL; | 733 | return -EINVAL; |
734 | i = array_index_nospec(arg, MAX_LEC_ITF); | ||
731 | if (!dev_lec[i]) { | 735 | if (!dev_lec[i]) { |
732 | int size; | 736 | int size; |
733 | 737 | ||