projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched/fair: Mark tg_is_idle() an inline in the !CONFIG_FAIR_GROUP_SCHED case
[linux-2.6-microblaze.git]
/
kernel
/
user_namespace.c
diff --git
a/kernel/user_namespace.c
b/kernel/user_namespace.c
index
9a4b980
..
8d62863
100644
(file)
--- a/
kernel/user_namespace.c
+++ b/
kernel/user_namespace.c
@@
-85,7
+85,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,
/*
* 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 verif
y
ing that the root directory is at the root of the
* mount namespace which allows all files to be accessed.
*/
ret = -EPERM;
* mount namespace which allows all files to be accessed.
*/
ret = -EPERM;
@@
-1014,7
+1014,7
@@
static ssize_t map_write(struct file *file, const char __user *buf,
goto out;
ret = -EINVAL;
}
goto out;
ret = -EINVAL;
}
- /* Be very certain
t
the new map actually exists */
+ /* Be very certain the new map actually exists */
if (new_map.nr_extents == 0)
goto out;
if (new_map.nr_extents == 0)
goto out;
@@
-1169,7
+1169,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.
/* 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 ha
d the approprp
iate capability.
+ * And the opener of the id file also ha
s the appropr
iate capability.
*/
if (ns_capable(ns->parent, cap_setid) &&
file_ns_capable(file, ns->parent, cap_setid))
*/
if (ns_capable(ns->parent, cap_setid) &&
file_ns_capable(file, ns->parent, cap_setid))