History

iommu/arm-smmu: Break insecure users by disabling bypass by default

If you're bisecting why your peripherals stopped working, it's probably this CL. Specifically if you see this in your dmesg: Unexpected global fault, this could be serious ...then it's almost certainly this CL. Running your IOMMU-enabled peripherals with the IOMMU in bypass mode is insecure and effectively disables the protection they provide. There are few reasons to allow unmatched stream bypass, and even fewer good ones. This patch starts the transition over to make it much harder to run your system insecurely. Expected steps: 1. By default disable bypass (so anyone insecure will notice) but make it easy for someone to re-enable bypass with just a KConfig change. That's this patch. 2. After people have had a little time to come to grips with the fact that they need to set their IOMMUs properly and have had time to dig into how to do this, the KConfig will be eliminated and bypass will simply be disabled. Folks who are truly upset and still haven't fixed their system can either figure out how to add 'arm-smmu.disable_bypass=n' to their command line or revert the patch in their own private kernel. Of course these folks will be less secure.

Douglas Anderson committed 7 years ago

Commit 954a03b1 parent 79a3aaa2 files · +27 −1Browse files

Unified · Split

2 files
  1. drivers/iommu/Kconfig +25 −0
  2. drivers/iommu/arm-smmu.c +2 −1
drivers/iommu/Kconfig+25−0
@@ -359,6 +359,31 @@ config ARM_SMMU · 358 unmodified lines
359359 Say Y here if your SoC includes an IOMMU device implementing
360360 the ARM SMMU architecture.
361361
362+config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
363+ bool "Default to disabling bypass on ARM SMMU v1 and v2"
364+ depends on ARM_SMMU
365+ default y
366+ help
367+ Say Y here to (by default) disable bypass streams such that
368+ incoming transactions from devices that are not attached to
369+ an iommu domain will report an abort back to the device and
370+ will not be allowed to pass through the SMMU.
371+
372+ Any old kernels that existed before this KConfig was
373+ introduced would default to _allowing_ bypass (AKA the
374+ equivalent of NO for this config). However the default for
375+ this option is YES because the old behavior is insecure.
376+
377+ There are few reasons to allow unmatched stream bypass, and
378+ even fewer good ones. If saying YES here breaks your board
379+ you should work on fixing your board. This KConfig option
380+ is expected to be removed in the future and we'll simply
381+ hardcode the bypass disable in the code.
382+
383+ NOTE: the kernel command line parameter
384+ 'arm-smmu.disable_bypass' will continue to override this
385+ config.
386+
362387 config ARM_SMMU_V3
363388 bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
364389 depends on ARM64
drivers/iommu/arm-smmu.c+2−1
@@ -110,7 +110,8 @@ static int force_stage; · 109 unmodified lines
110110 module_param(force_stage, int, S_IRUGO);
111111 MODULE_PARM_DESC(force_stage,
112112 "Force SMMU mappings to be installed at a particular stage of translation. A value of '1' or '2' forces the corresponding stage. All other values are ignored (i.e. no stage is forced). Note that selecting a specific stage will disable support for nested translation.");
113−static bool disable_bypass;
113+static bool disable_bypass =
114+ IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT);
114115 module_param(disable_bypass, bool, S_IRUGO);
115116 MODULE_PARM_DESC(disable_bypass,
116117 "Disable bypass streams such that incoming transactions from devices that are not attached to an iommu domain will report an abort back to the device and will not be allowed to pass through the SMMU.");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t