public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kernel:user_namespace - Fix for typos in comments.
@ 2015-05-23  5:07 Shailendra Verma
  2015-05-23 18:02 ` Eric W. Biederman
  0 siblings, 1 reply; 3+ messages in thread
From: Shailendra Verma @ 2015-05-23  5:07 UTC (permalink / raw)
  To: Eric W. Biederman, Andy Lutomirski, Al Viro, Andrew Morton,
	Fabian Frederick
  Cc: linux-kernel, Shailendra Verma


Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
---
 kernel/user_namespace.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 4109f83..02a1197 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -69,7 +69,7 @@ int create_user_ns(struct cred *new)
 	/*
 	 * Verify that we can not violate the policy of which files
 	 * may be accessed that is specified by the root directory,
-	 * by verifing that the root directory is at the root of the
+	 * by verifying that the root directory is at the root of the
 	 * mount namespace which allows all files to be accessed.
 	 */
 	if (current_chrooted())
@@ -617,7 +617,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
 	 *
 	 * There is a one time data dependency between reading the
 	 * count of the extents and the values of the extents.  The
-	 * desired behavior is to see the values of the extents that
+	 * desired behaviour is to see the values of the extents that
 	 * were written before the count of the extents.
 	 *
 	 * To achieve this smp_wmb() is used on guarantee the write
@@ -716,7 +716,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
 		    (next_line != NULL))
 			goto out;
 	}
-	/* Be very certaint the new map actually exists */
+	/* Be very certain the new map actually exists */
 	if (new_map.nr_extents == 0)
 		goto out;
 
@@ -841,7 +841,7 @@ static bool new_idmap_permitted(const struct file *file,
 
 	/* Allow the specified ids if we have the appropriate capability
 	 * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
-	 * And the opener of the id file also had the approprpiate capability.
+	 * And the opener of the id file also had the appropriate capability.
 	 */
 	if (ns_capable(ns->parent, cap_setid) &&
 	    file_ns_capable(file, ns->parent, cap_setid))
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] kernel:user_namespace - Fix for typos in comments.
  2015-05-23  5:07 [PATCH] kernel:user_namespace - Fix for typos in comments Shailendra Verma
@ 2015-05-23 18:02 ` Eric W. Biederman
  2015-05-29  0:09   ` Randy Dunlap
  0 siblings, 1 reply; 3+ messages in thread
From: Eric W. Biederman @ 2015-05-23 18:02 UTC (permalink / raw)
  To: Shailendra Verma
  Cc: Andy Lutomirski, Al Viro, Andrew Morton, Fabian Frederick,
	linux-kernel

Shailendra Verma <shailendra.capricorn@gmail.com> writes:

> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> ---
>  kernel/user_namespace.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
> index 4109f83..02a1197 100644
> --- a/kernel/user_namespace.c
> +++ b/kernel/user_namespace.c
> @@ -69,7 +69,7 @@ int create_user_ns(struct cred *new)
>  	/*
>  	 * Verify that we can not violate the policy of which files
>  	 * may be accessed that is specified by the root directory,
> -	 * by verifing that the root directory is at the root of the
> +	 * by verifying that the root directory is at the root of the
>  	 * mount namespace which allows all files to be accessed.
>  	 */
>  	if (current_chrooted())
> @@ -617,7 +617,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
>  	 *
>  	 * There is a one time data dependency between reading the
>  	 * count of the extents and the values of the extents.  The
> -	 * desired behavior is to see the values of the extents that
                   ^^^^^^^^ In american englic behavior is a correct spelling.
                            I don't know why the brits throw in extraneous letters.
> +	 * desired behaviour is to see the values of the extents that
>  	 * were written before the count of the extents.
>  	 *
>  	 * To achieve this smp_wmb() is used on guarantee the write
> @@ -716,7 +716,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
>  		    (next_line != NULL))
>  			goto out;
>  	}
> -	/* Be very certaint the new map actually exists */
> +	/* Be very certain the new map actually exists */
>  	if (new_map.nr_extents == 0)
>  		goto out;
>  
> @@ -841,7 +841,7 @@ static bool new_idmap_permitted(const struct file *file,
>  
>  	/* Allow the specified ids if we have the appropriate capability
>  	 * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
> -	 * And the opener of the id file also had the approprpiate capability.
> +	 * And the opener of the id file also had the appropriate capability.
>  	 */
>  	if (ns_capable(ns->parent, cap_setid) &&
>  	    file_ns_capable(file, ns->parent, cap_setid))

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] kernel:user_namespace - Fix for typos in comments.
  2015-05-23 18:02 ` Eric W. Biederman
@ 2015-05-29  0:09   ` Randy Dunlap
  0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2015-05-29  0:09 UTC (permalink / raw)
  To: Eric W. Biederman, Shailendra Verma
  Cc: Andy Lutomirski, Al Viro, Andrew Morton, Fabian Frederick,
	linux-kernel

On 05/23/15 11:02, Eric W. Biederman wrote:
> Shailendra Verma <shailendra.capricorn@gmail.com> writes:
> 
>> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
>> ---
>>  kernel/user_namespace.c |    8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
>> index 4109f83..02a1197 100644
>> --- a/kernel/user_namespace.c
>> +++ b/kernel/user_namespace.c
>> @@ -69,7 +69,7 @@ int create_user_ns(struct cred *new)
>>  	/*
>>  	 * Verify that we can not violate the policy of which files
>>  	 * may be accessed that is specified by the root directory,
>> -	 * by verifing that the root directory is at the root of the
>> +	 * by verifying that the root directory is at the root of the
>>  	 * mount namespace which allows all files to be accessed.
>>  	 */
>>  	if (current_chrooted())
>> @@ -617,7 +617,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
>>  	 *
>>  	 * There is a one time data dependency between reading the
>>  	 * count of the extents and the values of the extents.  The
>> -	 * desired behavior is to see the values of the extents that
>                    ^^^^^^^^ In american englic behavior is a correct spelling.
>                             I don't know why the brits throw in extraneous letters.

and kernel documentation accepts either form of spelling.

>> +	 * desired behaviour is to see the values of the extents that
>>  	 * were written before the count of the extents.
>>  	 *
>>  	 * To achieve this smp_wmb() is used on guarantee the write
>> @@ -716,7 +716,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
>>  		    (next_line != NULL))
>>  			goto out;
>>  	}
>> -	/* Be very certaint the new map actually exists */
>> +	/* Be very certain the new map actually exists */
>>  	if (new_map.nr_extents == 0)
>>  		goto out;
>>  
>> @@ -841,7 +841,7 @@ static bool new_idmap_permitted(const struct file *file,
>>  
>>  	/* Allow the specified ids if we have the appropriate capability
>>  	 * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
>> -	 * And the opener of the id file also had the approprpiate capability.
>> +	 * And the opener of the id file also had the appropriate capability.
>>  	 */
>>  	if (ns_capable(ns->parent, cap_setid) &&
>>  	    file_ns_capable(file, ns->parent, cap_setid))
> --


-- 
~Randy

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-05-29  0:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-23  5:07 [PATCH] kernel:user_namespace - Fix for typos in comments Shailendra Verma
2015-05-23 18:02 ` Eric W. Biederman
2015-05-29  0:09   ` Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox