linux-kernel - Re: [PATCH 3/4] mm: move gup() -> posix mlock() error conversion out of __mm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 11 Feb 2015 11:59:45 -0800 (PST)
From:	David Rientjes <rientjes@...gle.com>
To:	"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>
cc:	Andrew Morton <akpm@...ux-foundation.org>, linux-mm@...ck.org,
	linux-kernel@...r.kernel.org,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Michel Lespinasse <walken@...gle.com>,
	Rik van Riel <riel@...hat.com>
Subject: Re: [PATCH 3/4] mm: move gup() -> posix mlock() error conversion
 out of __mm_populate

On Wed, 11 Feb 2015, Kirill A. Shutemov wrote:

> This is praparation to moving mm_populate()-related code out of
> mm/mlock.c.
> 

s/praparation/preparation/

> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
> ---
>  mm/mlock.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/mm/mlock.c b/mm/mlock.c
> index c3ea18323034..0837fdb26047 100644
> --- a/mm/mlock.c
> +++ b/mm/mlock.c
> @@ -712,7 +712,6 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
>  				ret = 0;
>  				continue;	/* continue at next VMA */
>  			}
> -			ret = __mlock_posix_error_return(ret);
>  			break;
>  		}
>  		nend = nstart + ret * PAGE_SIZE;
> @@ -750,9 +749,13 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
>  		error = do_mlock(start, len, 1);
>  
>  	up_write(&current->mm->mmap_sem);
> -	if (!error)
> -		error = __mm_populate(start, len, 0);
> -	return error;
> +	if (error)
> +		return error;
> +
> +	error = __mm_populate(start, len, 0);
> +	if (error)
> +		return  __mlock_posix_error_return(error);

Extra space?

> +	return 0;
>  }
>  
>  SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/