|
@@ -352,6 +352,8 @@ static int parent_has_perm(struct dev_cgroup *childcg,
|
|
|
*/
|
|
|
static inline int may_allow_all(struct dev_cgroup *parent)
|
|
|
{
|
|
|
+ if (!parent)
|
|
|
+ return 1;
|
|
|
return parent->behavior == DEVCG_DEFAULT_ALLOW;
|
|
|
}
|
|
|
|
|
@@ -376,11 +378,14 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
|
|
|
int count, rc;
|
|
|
struct dev_exception_item ex;
|
|
|
struct cgroup *p = devcgroup->css.cgroup;
|
|
|
- struct dev_cgroup *parent = cgroup_to_devcgroup(p->parent);
|
|
|
+ struct dev_cgroup *parent = NULL;
|
|
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
|
return -EPERM;
|
|
|
|
|
|
+ if (p->parent)
|
|
|
+ parent = cgroup_to_devcgroup(p->parent);
|
|
|
+
|
|
|
memset(&ex, 0, sizeof(ex));
|
|
|
b = buffer;
|
|
|
|
|
@@ -391,11 +396,14 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
|
|
|
if (!may_allow_all(parent))
|
|
|
return -EPERM;
|
|
|
dev_exception_clean(devcgroup);
|
|
|
+ devcgroup->behavior = DEVCG_DEFAULT_ALLOW;
|
|
|
+ if (!parent)
|
|
|
+ break;
|
|
|
+
|
|
|
rc = dev_exceptions_copy(&devcgroup->exceptions,
|
|
|
&parent->exceptions);
|
|
|
if (rc)
|
|
|
return rc;
|
|
|
- devcgroup->behavior = DEVCG_DEFAULT_ALLOW;
|
|
|
break;
|
|
|
case DEVCG_DENY:
|
|
|
dev_exception_clean(devcgroup);
|