Re: [PATCH v8] RO/NX protection for loadable kernel modules

[Rusty Russell <rusty@rustcorp.com.au>]

On Mon, 1 Feb 2010 09:52:35 am Siarhei Liakh wrote:
> +/*
> + * Given BASE and SIZE this macro calculates the number of pages the
> + * memory regions occupies
> + */
> +#define NUMBER_OF_PAGES(BASE, SIZE) ((SIZE > 0) ?		\
> +		(PFN_DOWN((unsigned long)BASE + SIZE - 1) -	\
> +			 PFN_DOWN((unsigned long)BASE) + 1)	\
> +		: (0UL))

Needs more brackets around arguments, otherwise someone calling it with
a complex expression will get very upset.

Or just replace with a static inline function?

> +		if ((mod->module_core) && (mod->core_text_size > 0)) {

The core_text_size test should be enough here.

> +			begin_pfn = PFN_DOWN((unsigned long)mod->module_core);
> +			end_pfn = PFN_DOWN((unsigned long)mod->module_core +
> +						mod->core_text_size);
> +			if (end_pfn > begin_pfn)
> +				set_memory_rw(begin_pfn << PAGE_SHIFT,
> +							end_pfn - begin_pfn);

Much of this code might be neater if you created a helper:

	void set_page_attributes(void *start, void *end,
				 void (*set)(unsigned long start, unsigned long num_pages))
	{
		unsigned long begin_pfn = PFN_DOWN((unsigned long)start);
		unsigned long end_pfn = PFN_DOWN((unsigned long)end);
		if (end_pfn > begin_pfn)
			set(begin_pfn << PAGE_SHIFT, end_pfn - begin_pfn);
	}

But these are minor: patch looks good!

Thanks,
Rusty.