Re: [PATCH v2 1/4] device_cgroup: prepare exception list handling functions for two lists
On Thu, Jan 24, 2013 at 02:49:58PM -0500, a...@redhat.com wrote: > In the following patches, device_cgroup structure will have two sets of > behavior and exceptions list (actual one, another with the local settings) > so rework the functions to use exception list, not a device_cgroup. > > Cc: Tejun Heo > Cc: Serge Hallyn > Signed-off-by: Aristeu Rozanski Acked-by: Tejun Heo -- tejun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 1/4] device_cgroup: prepare exception list handling functions for two lists
In the following patches, device_cgroup structure will have two sets of
behavior and exceptions list (actual one, another with the local settings)
so rework the functions to use exception list, not a device_cgroup.
Cc: Tejun Heo
Cc: Serge Hallyn
Signed-off-by: Aristeu Rozanski
---
security/device_cgroup.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
--- github.orig/security/device_cgroup.c2013-01-24 10:40:32.814051897
-0500
+++ github/security/device_cgroup.c 2013-01-24 10:40:33.913068234 -0500
@@ -104,7 +104,7 @@ free_and_exit:
/*
* called under devcgroup_mutex
*/
-static int dev_exception_add(struct dev_cgroup *dev_cgroup,
+static int dev_exception_add(struct list_head *exceptions,
struct dev_exception_item *ex)
{
struct dev_exception_item *excopy, *walk;
@@ -115,7 +115,7 @@ static int dev_exception_add(struct dev_
if (!excopy)
return -ENOMEM;
- list_for_each_entry(walk, _cgroup->exceptions, list) {
+ list_for_each_entry(walk, exceptions, list) {
if (walk->type != ex->type)
continue;
if (walk->major != ex->major)
@@ -129,21 +129,21 @@ static int dev_exception_add(struct dev_
}
if (excopy != NULL)
- list_add_tail_rcu(>list, _cgroup->exceptions);
+ list_add_tail_rcu(>list, exceptions);
return 0;
}
/*
* called under devcgroup_mutex
*/
-static void dev_exception_rm(struct dev_cgroup *dev_cgroup,
+static void dev_exception_rm(struct list_head *exceptions,
struct dev_exception_item *ex)
{
struct dev_exception_item *walk, *tmp;
lockdep_assert_held(_mutex);
- list_for_each_entry_safe(walk, tmp, _cgroup->exceptions, list) {
+ list_for_each_entry_safe(walk, tmp, exceptions, list) {
if (walk->type != ex->type)
continue;
if (walk->major != ex->major)
@@ -514,10 +514,10 @@ case '\0':
* don't want to break compatibility
*/
if (devcgroup->behavior == DEVCG_DEFAULT_ALLOW) {
- dev_exception_rm(devcgroup, );
+ dev_exception_rm(>exceptions, );
return 0;
}
- return dev_exception_add(devcgroup, );
+ return dev_exception_add(>exceptions, );
case DEVCG_DENY:
/*
* If the default policy is to deny by default, try to remove
@@ -525,10 +525,10 @@ return 0;
* don't want to break compatibility
*/
if (devcgroup->behavior == DEVCG_DEFAULT_DENY) {
- dev_exception_rm(devcgroup, );
+ dev_exception_rm(>exceptions, );
return 0;
}
- return dev_exception_add(devcgroup, );
+ return dev_exception_add(>exceptions, );
default:
return -EINVAL;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 1/4] device_cgroup: prepare exception list handling functions for two lists
In the following patches, device_cgroup structure will have two sets of
behavior and exceptions list (actual one, another with the local settings)
so rework the functions to use exception list, not a device_cgroup.
Cc: Tejun Heo t...@kernel.org
Cc: Serge Hallyn serge.hal...@canonical.com
Signed-off-by: Aristeu Rozanski a...@redhat.com
---
security/device_cgroup.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
--- github.orig/security/device_cgroup.c2013-01-24 10:40:32.814051897
-0500
+++ github/security/device_cgroup.c 2013-01-24 10:40:33.913068234 -0500
@@ -104,7 +104,7 @@ free_and_exit:
/*
* called under devcgroup_mutex
*/
-static int dev_exception_add(struct dev_cgroup *dev_cgroup,
+static int dev_exception_add(struct list_head *exceptions,
struct dev_exception_item *ex)
{
struct dev_exception_item *excopy, *walk;
@@ -115,7 +115,7 @@ static int dev_exception_add(struct dev_
if (!excopy)
return -ENOMEM;
- list_for_each_entry(walk, dev_cgroup-exceptions, list) {
+ list_for_each_entry(walk, exceptions, list) {
if (walk-type != ex-type)
continue;
if (walk-major != ex-major)
@@ -129,21 +129,21 @@ static int dev_exception_add(struct dev_
}
if (excopy != NULL)
- list_add_tail_rcu(excopy-list, dev_cgroup-exceptions);
+ list_add_tail_rcu(excopy-list, exceptions);
return 0;
}
/*
* called under devcgroup_mutex
*/
-static void dev_exception_rm(struct dev_cgroup *dev_cgroup,
+static void dev_exception_rm(struct list_head *exceptions,
struct dev_exception_item *ex)
{
struct dev_exception_item *walk, *tmp;
lockdep_assert_held(devcgroup_mutex);
- list_for_each_entry_safe(walk, tmp, dev_cgroup-exceptions, list) {
+ list_for_each_entry_safe(walk, tmp, exceptions, list) {
if (walk-type != ex-type)
continue;
if (walk-major != ex-major)
@@ -514,10 +514,10 @@ case '\0':
* don't want to break compatibility
*/
if (devcgroup-behavior == DEVCG_DEFAULT_ALLOW) {
- dev_exception_rm(devcgroup, ex);
+ dev_exception_rm(devcgroup-exceptions, ex);
return 0;
}
- return dev_exception_add(devcgroup, ex);
+ return dev_exception_add(devcgroup-exceptions, ex);
case DEVCG_DENY:
/*
* If the default policy is to deny by default, try to remove
@@ -525,10 +525,10 @@ return 0;
* don't want to break compatibility
*/
if (devcgroup-behavior == DEVCG_DEFAULT_DENY) {
- dev_exception_rm(devcgroup, ex);
+ dev_exception_rm(devcgroup-exceptions, ex);
return 0;
}
- return dev_exception_add(devcgroup, ex);
+ return dev_exception_add(devcgroup-exceptions, ex);
default:
return -EINVAL;
}
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 1/4] device_cgroup: prepare exception list handling functions for two lists
On Thu, Jan 24, 2013 at 02:49:58PM -0500, a...@redhat.com wrote: In the following patches, device_cgroup structure will have two sets of behavior and exceptions list (actual one, another with the local settings) so rework the functions to use exception list, not a device_cgroup. Cc: Tejun Heo t...@kernel.org Cc: Serge Hallyn serge.hal...@canonical.com Signed-off-by: Aristeu Rozanski a...@redhat.com Acked-by: Tejun Heo t...@kernel.org -- tejun -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
