From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Dan Williams <dan.j.williams@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andrey Ryabinin <aryabinin@virtuozzo•com>
Subject: linux-next: manual merge of the akpm-current tree with the nvdimm tree
Date: Thu, 31 Dec 2015 21:51:40 +1100 [thread overview]
Message-ID: <20151231215140.4905c760@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Kconfig.debug
between commit:
96efc4fed452 ("arch: consolidate CONFIG_STRICT_DEVM in lib/Kconfig.debug")
from the nvdimm tree and commit:
3e138efd477e ("UBSAN: run-time undefined behavior sanity checker")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc lib/Kconfig.debug
index 01be6fcceda2,19f7461e1594..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1886,42 -1860,4 +1893,44 @@@ source "samples/Kconfig
source "lib/Kconfig.kgdb"
+config ARCH_HAS_DEVMEM_IS_ALLOWED
+ bool
+
+config STRICT_DEVMEM
+ bool "Filter access to /dev/mem"
+ depends on MMU
+ depends on ARCH_HAS_DEVMEM_IS_ALLOWED
+ default y if TILE || PPC
+ ---help---
+ If this option is disabled, you allow userspace (root) access to all
+ of memory, including kernel and userspace memory. Accidental
+ access to this is obviously disastrous, but specific access can
+ be used by people debugging the kernel. Note that with PAT support
+ enabled, even in this case there are restrictions on /dev/mem
+ use due to the cache aliasing requirements.
+
+ If this option is switched on, and IO_STRICT_DEVMEM=n, the /dev/mem
+ file only allows userspace access to PCI space and the BIOS code and
+ data regions. This is sufficient for dosemu and X and all common
+ users of /dev/mem.
+
+ If in doubt, say Y.
+
+config IO_STRICT_DEVMEM
+ bool "Filter I/O access to /dev/mem"
+ depends on STRICT_DEVMEM
+ default STRICT_DEVMEM
+ ---help---
+ If this option is disabled, you allow userspace (root) access to all
+ io-memory regardless of whether a driver is actively using that
+ range. Accidental access to this is obviously disastrous, but
+ specific access can be used by people debugging kernel drivers.
+
+ If this option is switched on, the /dev/mem file only allows
+ userspace access to *idle* io-memory ranges (see /proc/iomem) This
+ may break traditional users of /dev/mem (dosemu, legacy X, etc...)
+ if the driver using a given range cannot be disabled.
+
+ If in doubt, say Y.
++
+ source "lib/Kconfig.ubsan"
next reply other threads:[~2015-12-31 10:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 10:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-08 5:51 linux-next: manual merge of the akpm-current tree with the nvdimm tree Stephen Rothwell
2017-04-24 6:47 Stephen Rothwell
2017-11-16 3:16 Stephen Rothwell
2017-11-16 4:55 ` Minchan Kim
2018-06-04 10:24 Stephen Rothwell
2021-12-07 6:39 Stephen Rothwell
2021-12-07 6:55 ` Christoph Hellwig
2021-12-07 10:23 ` Joao Martins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151231215140.4905c760@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=aryabinin@virtuozzo$(echo .)com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox