- fix for 3.0.3

[packages/kernel.git] / kernel-apparmor.patch

diff --git a/kernel-apparmor.patch b/kernel-apparmor.patch
index 605382806d1c0cd0254b90119d0154c092799bd5..8550f19da8147bb89da60b8828a05929fb3133a1 100644 (file)
--- a/kernel-apparmor.patch
+++ b/kernel-apparmor.patch
@@ -162,7 +162,27 @@ index ae3a698..05c018b 100644
  #include "include/path.h"
  #include "include/policy.h"
  #include "include/procattr.h"
-@@ -620,6 +621,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+@@ -651,6 +750,19 @@ static struct security_operations apparmor_ops = {
+       .getprocattr =                  apparmor_getprocattr,
+       .setprocattr =                  apparmor_setprocattr,
+ 
++      .socket_create =                apparmor_socket_create,
++      .socket_bind =                  apparmor_socket_bind,
++      .socket_connect =               apparmor_socket_connect,
++      .socket_listen =                apparmor_socket_listen,
++      .socket_accept =                apparmor_socket_accept,
++      .socket_sendmsg =               apparmor_socket_sendmsg,
++      .socket_recvmsg =               apparmor_socket_recvmsg,
++      .socket_getsockname =           apparmor_socket_getsockname,
++      .socket_getpeername =           apparmor_socket_getpeername,
++      .socket_getsockopt =            apparmor_socket_getsockopt,
++      .socket_setsockopt =            apparmor_socket_setsockopt,
++      .socket_shutdown =              apparmor_socket_shutdown,
++
+       .cred_alloc_blank =             apparmor_cred_alloc_blank,
+       .cred_free =                    apparmor_cred_free,
+       .cred_prepare =                 apparmor_cred_prepare,
+@@ -949,4 +950,102 @@ static int apparmor_task_setrlimit(struct task_struct *task,
        return error;
  }
  
@@ -264,29 +284,8 @@ index ae3a698..05c018b 100644
 +      return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
 +}
 +
- static struct security_operations apparmor_ops = {
-       .name =                         "apparmor",
- 
-@@ -651,6 +750,19 @@ static struct security_operations apparmor_ops = {
-       .getprocattr =                  apparmor_getprocattr,
-       .setprocattr =                  apparmor_setprocattr,
- 
-+      .socket_create =                apparmor_socket_create,
-+      .socket_bind =                  apparmor_socket_bind,
-+      .socket_connect =               apparmor_socket_connect,
-+      .socket_listen =                apparmor_socket_listen,
-+      .socket_accept =                apparmor_socket_accept,
-+      .socket_sendmsg =               apparmor_socket_sendmsg,
-+      .socket_recvmsg =               apparmor_socket_recvmsg,
-+      .socket_getsockname =           apparmor_socket_getsockname,
-+      .socket_getpeername =           apparmor_socket_getpeername,
-+      .socket_getsockopt =            apparmor_socket_getsockopt,
-+      .socket_setsockopt =            apparmor_socket_setsockopt,
-+      .socket_shutdown =              apparmor_socket_shutdown,
-+
-       .cred_alloc_blank =             apparmor_cred_alloc_blank,
-       .cred_free =                    apparmor_cred_free,
-       .cred_prepare =                 apparmor_cred_prepare,
+ security_initcall(apparmor_init);
+
 diff --git a/security/apparmor/net.c b/security/apparmor/net.c
 new file mode 100644
 index 0000000..1765901