Skip to content

Commit

Permalink
x86/ioremap: Improve iounmap() address range checks
Browse files Browse the repository at this point in the history
Allowing iounmap() on memory that was not ioremap()'d in the first
place is obviously a bad idea.  There is currently a feeble attempt to
avoid errant iounmap()s by checking to see if the address is below
"high_memory".  But that's imprecise at best because there are plenty
of high addresses that are also invalid to call iounmap() on.

Thankfully, there is a more precise helper: is_ioremap_addr().  x86
just does not use it in iounmap().

Restrict iounmap() to addresses in the ioremap region, by using
is_ioremap_addr(). This aligns x86 closer to the generic iounmap()
implementation.

Additionally, add a warning in case there is an attempt to iounmap()
invalid memory.  This replaces an existing silent return and will
help alert folks to any incorrect usage of iounmap().

Due to VMALLOC_START on i386 not being present in asm/pgtable.h,
include for asm/vmalloc.h had to be added to include/linux/ioremap.h.

[ dhansen: tweak subject and changelog ]

Signed-off-by: Max Ramanouski <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Reviewed-by: Alistair Popple <[email protected]>
Link: https://lore.kernel.org/all/20240824220111.84441-1-max8rr8%40gmail.com
  • Loading branch information
max8rr8 authored and hansendc committed Aug 26, 2024
1 parent d4245fd commit 50c6dbd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/ioremap.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/mmiotrace.h>
Expand Down Expand Up @@ -457,7 +458,7 @@ void iounmap(volatile void __iomem *addr)
{
struct vm_struct *p, *o;

if ((void __force *)addr <= high_memory)
if (WARN_ON_ONCE(!is_ioremap_addr((void __force *)addr)))
return;

/*
Expand Down
1 change: 1 addition & 0 deletions include/linux/ioremap.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <linux/kasan.h>
#include <asm/pgtable.h>
#include <asm/vmalloc.h>

#if defined(CONFIG_HAS_IOMEM) || defined(CONFIG_GENERIC_IOREMAP)
/*
Expand Down

0 comments on commit 50c6dbd

Please sign in to comment.