On Monday 28 December 2015 12:20:45 Ard Biesheuvel wrote:
> @@ -75,8 +76,13 @@
> * private definitions which should NOT be used outside memory.h
> * files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
> */
> -#define __virt_to_phys(x) (((phys_addr_t)(x) - PAGE_OFFSET +
> PHYS_OFFSET))
> +#define __virt_to_phys(x) ({ \
> + phys_addr_t __x = (phys_addr_t)(x); \
> + __x >= PAGE_OFFSET ? (__x - PAGE_OFFSET + PHYS_OFFSET) : \
> + (__x - KIMAGE_VADDR + PHYS_OFFSET); })
> +
> #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET +
> PAGE_OFFSET))
> +#define __phys_to_kimg(x) ((unsigned long)((x) - PHYS_OFFSET +
> KIMAGE_VADDR))
Having a conditional here is a bit unfortunate.
IIRC KASLR means something different depending on the architecture, we either
randomize
the physical address, or the virtual address, or both, and that addresses
different
attack scenarios. You seem to leave the physical address unchanged, which means
that
an attacker that has gained access to a DMA master device can potentially still
modify
the kernel without knowing the virtual address.
Similarly, you seem to leave the kernel mapped at the original virtual address
and
just add a second map (or your __phys_to_virt is wrong), so if someone has the
ability to access a kernel virtual memory address from user space, they also
don't
need the relocated address because they can potentially access the kernel .text
and .data through the linear mapping.
How about a different approach that keeps the relocatable kernel, but moves it
in
physical memory with the same random offset as the virtual address? That way,
both
would be random, and you can keep the simple virt_to_phys() function.
I suppose the downside of that is that the number of random bits is then limited
by the size of the first memblock, which is smaller than the vmalloc area.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
