All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Hansen <dave.hansen@intel.com>
To: Tycho Andersen <tycho@docker.com>, linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
	Marco Benatto <marco.antonio.780@gmail.com>,
	Juerg Haefliger <juerg.haefliger@canonical.com>,
	Juerg Haefliger <juerg.haefliger@hpe.com>
Subject: [kernel-hardening] Re: [PATCH v5 03/10] swiotlb: Map the buffer if it was unmapped by XPFO
Date: Wed, 20 Sep 2017 09:19:56 -0700	[thread overview]
Message-ID: <5877eed8-0e8e-0dec-fdc7-de01bdbdafa8@intel.com> (raw)
In-Reply-To: <20170809200755.11234-4-tycho@docker.com>

On 08/09/2017 01:07 PM, Tycho Andersen wrote:
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -420,8 +420,9 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
>  {
>  	unsigned long pfn = PFN_DOWN(orig_addr);
>  	unsigned char *vaddr = phys_to_virt(tlb_addr);
> +	struct page *page = pfn_to_page(pfn);
>  
> -	if (PageHighMem(pfn_to_page(pfn))) {
> +	if (PageHighMem(page) || xpfo_page_is_unmapped(page)) {
>  		/* The buffer does not have a mapping.  Map it in and copy */
>  		unsigned int offset = orig_addr & ~PAGE_MASK;
>  		char *buffer;

This is a little scary.  I wonder how many more of these are in the
kernel, like:

> static inline void *skcipher_map(struct scatter_walk *walk)
> {
>         struct page *page = scatterwalk_page(walk);
> 
>         return (PageHighMem(page) ? kmap_atomic(page) : page_address(page)) +
>                offset_in_page(walk->offset);
> }

Is there any better way to catch these?  Like, can we add some debugging
to check for XPFO pages in __va()?

WARNING: multiple messages have this Message-ID (diff)
From: Dave Hansen <dave.hansen@intel.com>
To: Tycho Andersen <tycho@docker.com>, linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
	Marco Benatto <marco.antonio.780@gmail.com>,
	Juerg Haefliger <juerg.haefliger@canonical.com>,
	Juerg Haefliger <juerg.haefliger@hpe.com>
Subject: Re: [PATCH v5 03/10] swiotlb: Map the buffer if it was unmapped by XPFO
Date: Wed, 20 Sep 2017 09:19:56 -0700	[thread overview]
Message-ID: <5877eed8-0e8e-0dec-fdc7-de01bdbdafa8@intel.com> (raw)
In-Reply-To: <20170809200755.11234-4-tycho@docker.com>

On 08/09/2017 01:07 PM, Tycho Andersen wrote:
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -420,8 +420,9 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
>  {
>  	unsigned long pfn = PFN_DOWN(orig_addr);
>  	unsigned char *vaddr = phys_to_virt(tlb_addr);
> +	struct page *page = pfn_to_page(pfn);
>  
> -	if (PageHighMem(pfn_to_page(pfn))) {
> +	if (PageHighMem(page) || xpfo_page_is_unmapped(page)) {
>  		/* The buffer does not have a mapping.  Map it in and copy */
>  		unsigned int offset = orig_addr & ~PAGE_MASK;
>  		char *buffer;

This is a little scary.  I wonder how many more of these are in the
kernel, like:

> static inline void *skcipher_map(struct scatter_walk *walk)
> {
>         struct page *page = scatterwalk_page(walk);
> 
>         return (PageHighMem(page) ? kmap_atomic(page) : page_address(page)) +
>                offset_in_page(walk->offset);
> }

Is there any better way to catch these?  Like, can we add some debugging
to check for XPFO pages in __va()?

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

WARNING: multiple messages have this Message-ID (diff)
From: Dave Hansen <dave.hansen@intel.com>
To: Tycho Andersen <tycho@docker.com>, linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
	Marco Benatto <marco.antonio.780@gmail.com>,
	Juerg Haefliger <juerg.haefliger@canonical.com>,
	Juerg Haefliger <juerg.haefliger@hpe.com>
Subject: Re: [PATCH v5 03/10] swiotlb: Map the buffer if it was unmapped by XPFO
Date: Wed, 20 Sep 2017 09:19:56 -0700	[thread overview]
Message-ID: <5877eed8-0e8e-0dec-fdc7-de01bdbdafa8@intel.com> (raw)
In-Reply-To: <20170809200755.11234-4-tycho@docker.com>

On 08/09/2017 01:07 PM, Tycho Andersen wrote:
> --- a/lib/swiotlb.c
> +++ b/lib/swiotlb.c
> @@ -420,8 +420,9 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
>  {
>  	unsigned long pfn = PFN_DOWN(orig_addr);
>  	unsigned char *vaddr = phys_to_virt(tlb_addr);
> +	struct page *page = pfn_to_page(pfn);
>  
> -	if (PageHighMem(pfn_to_page(pfn))) {
> +	if (PageHighMem(page) || xpfo_page_is_unmapped(page)) {
>  		/* The buffer does not have a mapping.  Map it in and copy */
>  		unsigned int offset = orig_addr & ~PAGE_MASK;
>  		char *buffer;

This is a little scary.  I wonder how many more of these are in the
kernel, like:

> static inline void *skcipher_map(struct scatter_walk *walk)
> {
>         struct page *page = scatterwalk_page(walk);
> 
>         return (PageHighMem(page) ? kmap_atomic(page) : page_address(page)) +
>                offset_in_page(walk->offset);
> }

Is there any better way to catch these?  Like, can we add some debugging
to check for XPFO pages in __va()?

  parent reply	other threads:[~2017-09-20 16:19 UTC|newest]

Thread overview: 135+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-09 20:07 [kernel-hardening] [PATCH v5 00/10] Add support for eXclusive Page Frame Ownership Tycho Andersen
2017-08-09 20:07 ` Tycho Andersen
2017-08-09 20:07 ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 01/10] mm: add MAP_HUGETLB support to vm_mmap Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 02/10] mm, x86: Add support for eXclusive Page Frame Ownership (XPFO) Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-14 18:51   ` [kernel-hardening] " Laura Abbott
2017-08-14 18:51     ` Laura Abbott
2017-08-14 18:51     ` Laura Abbott
2017-08-14 22:30   ` [kernel-hardening] " Laura Abbott
2017-08-14 22:30     ` Laura Abbott
2017-08-14 22:30     ` Laura Abbott
2017-08-15  3:47     ` [kernel-hardening] " Tycho Andersen
2017-08-15  3:47       ` Tycho Andersen
2017-08-15  3:47       ` Tycho Andersen
2017-08-15  3:51       ` [kernel-hardening] " Tycho Andersen
2017-08-15  3:51         ` Tycho Andersen
2017-08-15  3:51         ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 03/10] swiotlb: Map the buffer if it was unmapped by XPFO Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-10 13:01   ` [kernel-hardening] " Konrad Rzeszutek Wilk
2017-08-10 13:01     ` Konrad Rzeszutek Wilk
2017-08-10 13:01     ` Konrad Rzeszutek Wilk
2017-08-10 16:22     ` [kernel-hardening] " Tycho Andersen
2017-08-10 16:22       ` Tycho Andersen
2017-08-10 16:22       ` Tycho Andersen
2017-09-20 16:19   ` Dave Hansen [this message]
2017-09-20 16:19     ` Dave Hansen
2017-09-20 16:19     ` Dave Hansen
2017-09-20 22:47     ` [kernel-hardening] " Tycho Andersen
2017-09-20 22:47       ` Tycho Andersen
2017-09-20 22:47       ` Tycho Andersen
2017-09-20 23:25       ` [kernel-hardening] " Dave Hansen
2017-09-20 23:25         ` Dave Hansen
2017-09-20 23:25         ` Dave Hansen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 04/10] arm64: Add __flush_tlb_one() Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-12 11:26   ` [kernel-hardening] " Mark Rutland
2017-08-12 11:26     ` Mark Rutland
2017-08-14 16:35     ` Tycho Andersen
2017-08-14 16:35       ` Tycho Andersen
2017-08-14 16:50       ` Mark Rutland
2017-08-14 16:50         ` Mark Rutland
2017-08-14 17:01         ` Tycho Andersen
2017-08-14 17:01           ` Tycho Andersen
2017-08-23 16:58         ` Tycho Andersen
2017-08-23 16:58           ` Tycho Andersen
2017-08-23 17:04           ` Mark Rutland
2017-08-23 17:04             ` Mark Rutland
2017-08-23 17:13             ` Tycho Andersen
2017-08-23 17:13               ` Tycho Andersen
2017-08-24 15:45               ` Mark Rutland
2017-08-24 15:45                 ` Mark Rutland
2017-08-29 17:24                 ` Tycho Andersen
2017-08-29 17:24                   ` Tycho Andersen
2017-08-30  5:31             ` Juerg Haefliger
2017-08-30 16:47               ` Tycho Andersen
2017-08-30 16:47                 ` Tycho Andersen
2017-08-31  9:43                 ` Juerg Haefliger
2017-08-31  9:47                   ` Mark Rutland
2017-08-31  9:47                     ` Mark Rutland
2017-08-31 21:21                     ` Tycho Andersen
2017-08-31 21:21                       ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 05/10] arm64/mm: Add support for XPFO Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-11 18:01   ` [kernel-hardening] " Laura Abbott
2017-08-11 18:01     ` Laura Abbott
2017-08-11 20:19     ` Tycho Andersen
2017-08-11 20:19       ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 06/10] arm64/mm: Disable section mappings if XPFO is enabled Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-11 17:25   ` [kernel-hardening] " Laura Abbott
2017-08-11 17:25     ` Laura Abbott
2017-08-11 21:13     ` Tycho Andersen
2017-08-11 21:13       ` Tycho Andersen
2017-08-11 21:52       ` Tycho Andersen
2017-08-11 21:52         ` Tycho Andersen
2017-08-12 11:17       ` Mark Rutland
2017-08-12 11:17         ` Mark Rutland
2017-08-14 16:22         ` Tycho Andersen
2017-08-14 16:22           ` Tycho Andersen
2017-08-14 18:42           ` Laura Abbott
2017-08-14 18:42             ` Laura Abbott
2017-08-14 20:28             ` Tycho Andersen
2017-08-14 20:28               ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 07/10] arm64/mm: Don't flush the data cache if the page is unmapped by XPFO Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-12 11:57   ` [kernel-hardening] " Mark Rutland
2017-08-12 11:57     ` Mark Rutland
2017-08-14 16:54     ` Mark Rutland
2017-08-14 16:54       ` Mark Rutland
2017-08-14 20:27     ` Tycho Andersen
2017-08-14 20:27       ` Tycho Andersen
2017-08-15  9:39       ` Mark Rutland
2017-08-15  9:39         ` Mark Rutland
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 08/10] arm64/mm: Add support for XPFO to swiotlb Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-10 13:11   ` [kernel-hardening] " Konrad Rzeszutek Wilk
2017-08-10 13:11     ` Konrad Rzeszutek Wilk
2017-08-10 13:11     ` Konrad Rzeszutek Wilk
2017-08-10 16:35     ` [kernel-hardening] " Tycho Andersen
2017-08-10 16:35       ` Tycho Andersen
2017-08-10 16:35       ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 09/10] mm: add a user_virt_to_phys symbol Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07 ` [kernel-hardening] [PATCH v5 10/10] lkdtm: Add test for XPFO Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-09 20:07   ` Tycho Andersen
2017-08-12 20:24   ` [kernel-hardening] " kbuild test robot
2017-08-12 20:24     ` kbuild test robot
2017-08-12 20:24     ` kbuild test robot
2017-08-14 16:21     ` [kernel-hardening] " Tycho Andersen
2017-08-14 16:21       ` Tycho Andersen
2017-08-14 16:21       ` Tycho Andersen
2017-08-12 21:05   ` [kernel-hardening] " kbuild test robot
2017-08-12 21:05     ` kbuild test robot
2017-08-12 21:05     ` kbuild test robot
2017-08-14 19:10   ` [kernel-hardening] " Kees Cook
2017-08-14 19:10     ` Kees Cook
2017-08-14 19:10     ` Kees Cook
2017-08-14 20:29     ` [kernel-hardening] " Tycho Andersen
2017-08-14 20:29       ` Tycho Andersen
2017-08-14 20:29       ` Tycho Andersen
2017-08-11 23:35 ` [kernel-hardening] [PATCH v5 00/10] Add support for eXclusive Page Frame Ownership Laura Abbott
2017-08-11 23:35   ` Laura Abbott

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=5877eed8-0e8e-0dec-fdc7-de01bdbdafa8@intel.com \
    --to=dave.hansen@intel.com \
    --cc=juerg.haefliger@canonical.com \
    --cc=juerg.haefliger@hpe.com \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=marco.antonio.780@gmail.com \
    --cc=tycho@docker.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.